Merge branch 'password-change-fix' into 'master'

Password change fix

See merge request !151

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/PasswordView.java

@@ -58,7 +58,8 @@ public class PasswordView extends GenericCDIView {
 		boolean mod = permbean.hasPermission(UserPermission.MODIFY);
 		boolean mod = permbean.hasPermission(UserPermission.MODIFY);
 		if (permbean.isCurrentUser(user) || mod) {
 		if (permbean.isCurrentUser(user) || mod) {
 			logger.debug("foo {}, {}", mod, user.checkPassword(oldPassword));
 			logger.debug("foo {}, {}", mod, user.checkPassword(oldPassword));
-			if (!mod && !user.checkPassword(oldPassword)) {
+
+			if (!user.checkPassword(oldPassword)) {
 				super.addFaceMessage("userview.oldPasswordError");
 				super.addFaceMessage("userview.oldPasswordError");
 			} else if (password == null || !password.equals(passwordcheck)) {
 			} else if (password == null || !password.equals(passwordcheck)) {
 				super.addFaceMessage("userview.passwordsDontMatch");
 				super.addFaceMessage("userview.passwordsDontMatch");