diff --git a/src/main/java/de/jalin/ldapadmin/web/ProfileServlet.java b/src/main/java/de/jalin/ldapadmin/web/ProfileServlet.java
index da8c7c9..0bde396 100644
--- a/src/main/java/de/jalin/ldapadmin/web/ProfileServlet.java
+++ b/src/main/java/de/jalin/ldapadmin/web/ProfileServlet.java
@@ -108,6 +108,8 @@ public class ProfileServlet extends AbstractLDAPServlet {
                 usersDAO.update(usr);
                 httpSession.setAttribute("successmessage", messages.getString("ProfileServlet.password_changed"));
                 httpSession.setAttribute("operation", "profile");
+                httpSession.setAttribute("formdisabled", "disabled");
+                httpSession.setAttribute("iddisabled", "disabled");
                 httpSession.setAttribute("user", usr);
                 req.getRequestDispatcher("/user.jsp").forward(req, resp);
             }
diff --git a/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java b/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java
index ff6ff8a..52654a6 100644
--- a/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java
+++ b/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java
@@ -96,7 +96,6 @@ public class ResetPasswordServlet extends AbstractLDAPServlet {
         final UsersDAO usrDAO = new UsersDAO(ldapSession);
         final String loginParam = req.getParameter("login");
         final User sessUsr = (User) httpSession.getAttribute("user");
-//        final MailboxDAO hsMailboxDAO = new MailboxDAO(getTicketProvider());
         if (loginParam != null && sessUsr != null && loginParam.equals(sessUsr.getLogin())) {
             final String password1 = req.getParameter("password");
             final String password2 = req.getParameter("password2");
@@ -110,7 +109,11 @@ public class ResetPasswordServlet extends AbstractLDAPServlet {
                         sessUsr.setAndValidatePassword(password1);
                         usrDAO.update(sessUsr);
                         httpSession.setAttribute("successmessage", messages.getString("ResetPasswordServlet.password_changed"));
-                        req.getRequestDispatcher("/new-password.jsp").forward(req, resp);
+                        httpSession.setAttribute("operation", "profile");
+                        httpSession.setAttribute("formdisabled", "disabled");
+                        httpSession.setAttribute("iddisabled", "disabled");
+                        httpSession.setAttribute("user", sessUsr);
+                        req.getRequestDispatcher("/user.jsp").forward(req, resp);
                         return;
                     } catch (SimplePasswordException e) {
                         httpSession.setAttribute("user", sessUsr);