=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java	2016-03-04 10:12:52 +0000
@@ -82,11 +82,11 @@
             }
         }
 
-        boolean credentialsExpired = userService.credentialsNonExpired( credentials );
+        boolean credentialsNonExpired = userService.credentialsNonExpired( credentials );
 
         boolean enabled = !credentials.isDisabled() && !credentials.isExternalAuth();
         
         return new User( credentials.getUsername(), credentials.getPassword(),
-            enabled, true, credentialsExpired, true, SecurityUtils.getGrantedAuthorities( credentials ) );
+            enabled, true, credentialsNonExpired, true, SecurityUtils.getGrantedAuthorities( credentials ) );
     }
 }