diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/api/AuthenticationApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/api/AuthenticationApiResource.java
index abd6771b5..ea2bca460 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/api/AuthenticationApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/api/AuthenticationApiResource.java
@@ -22,6 +22,7 @@ import org.mifosplatform.infrastructure.security.service.SpringSecurityPlatformS
 import org.mifosplatform.useradministration.data.RoleData;
 import org.mifosplatform.useradministration.domain.AppUser;
 import org.mifosplatform.useradministration.domain.Role;
+import org.mifosplatform.useradministration.exception.UserNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Scope;
@@ -58,6 +59,10 @@ public class AuthenticationApiResource {
 
         final Authentication authentication = new UsernamePasswordAuthenticationToken(username, password);
         final Authentication authenticationCheck = this.customAuthenticationProvider.authenticate(authentication);
+        final AppUser principal = (AppUser) authenticationCheck.getPrincipal();
+        if (principal.isDeleted() || principal.isNotEnabled() ) {
+            throw new UserNotFoundException(principal.getId());
+        }
 
         final Collection<String> permissions = new ArrayList<String>();
         AuthenticatedUserData authenticatedUserData = new AuthenticatedUserData(username, permissions);
@@ -67,7 +72,7 @@ public class AuthenticationApiResource {
             for (final GrantedAuthority grantedAuthority : authorities) {
                 permissions.add(grantedAuthority.getAuthority());
             }
-            final AppUser principal = (AppUser) authenticationCheck.getPrincipal();
+
             final byte[] base64EncodedAuthenticationKey = Base64.encode(username + ":" + password);
 
             final Collection<RoleData> roles = new ArrayList<RoleData>();
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/domain/AppUser.java b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/domain/AppUser.java
index d64f849d3..64a40b2b5 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/domain/AppUser.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/domain/AppUser.java
@@ -544,4 +544,8 @@ public class AppUser extends AbstractPersistable<Long> implements PlatformUser {
 
         return passwordEncodedValue;
     }
+
+    public boolean isNotEnabled() {
+        return !isEnabled();
+    }
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt
index fbc2bf90c..342933820 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt
index 87f461b55..34bc1543d 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt
index 81fce04f7..0426d38ab 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt
index f88606690..70da51a00 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt
index e1a972b6a..709040ff3 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt
index f67ff3107..d08aeda0c 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt
index 93df7c18d..256450bf6 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt
index 225f0b3ae..c5c1b8974 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt
index 1415077b4..581b0a4b6 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt
index c298c5101..7f2604b4d 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt
index 4075d3c55..8f1d7bbc9 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt
index 0c69acbde..ab66914dd 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt
index 051cf99b5..976d05e56 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt
index dd8d0786c..dd7fbaecf 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt
index a3dfef7f5..0baa28881 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt
index f801d3dc2..353e8c203 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt
index 280a15ea7..b7a13299e 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt
index a6f870030..aec6f96ea 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt
index 06c0114a3..3d2270971 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt
index bbe7de5e8..639e0fdf7 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt
index 33cb78bf8..7e68f7ef5 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt
index bd9901ceb..424cdc8cd 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt differ
diff --git a/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt
index 69844750e..4eee7b8be 100644
Binary files a/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt and b/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt differ