diff --git a/java/com.sap.sse.security.ui/.settings/com.google.gwt.eclipse.core.prefs b/java/com.sap.sse.security.ui/.settings/com.google.gwt.eclipse.core.prefs
index c939c8cc5d0..27686fe0389 100644
--- a/java/com.sap.sse.security.ui/.settings/com.google.gwt.eclipse.core.prefs
+++ b/java/com.sap.sse.security.ui/.settings/com.google.gwt.eclipse.core.prefs
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
 entryPointModules=
-gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBWy13YXIgLiAtbG9jYWxXb3JrZXJzIDMgLXN0cmljdCAtbG9nTGV2ZWwgVFJBQ0VdXT48L2V4dHJhLWFyZ3M+PHZtLWFyZ3M+PCFbQ0RBVEFbLVhteDIwMjRtIC1EZ3d0LnVzZWFyY2hpdmVzPWZhbHNlXV0+PC92bS1hcmdzPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zc2Uuc2VjdXJpdHkudWkuRW1haWxWYWxpZGF0aW9uPC9lbnRyeS1wb2ludC1tb2R1bGU+PGVudHJ5LXBvaW50LW1vZHVsZT5jb20uc2FwLnNzZS5zZWN1cml0eS51aS5DaGFuZ2VQYXNzd29yZDwvZW50cnktcG9pbnQtbW9kdWxlPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zc2Uuc2VjdXJpdHkudWkuTG9naW48L2VudHJ5LXBvaW50LW1vZHVsZT48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5zYXAuc3NlLnNlY3VyaXR5LnVpLk9BdXRoTG9naW48L2VudHJ5LXBvaW50LW1vZHVsZT48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5zYXAuc3NlLnNlY3VyaXR5LnVpLlVzZXJNYW5hZ2VtZW50PC9lbnRyeS1wb2ludC1tb2R1bGU+PGVudHJ5LXBvaW50LW1vZHVsZT5jb20uc2FwLnNzZS5zZWN1cml0eS51aS5SZWdpc3RlcjwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+
+gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBWy13YXIgLiAtbG9jYWxXb3JrZXJzIDMgLXN0cmljdCAtbG9nTGV2ZWwgVFJBQ0VdXT48L2V4dHJhLWFyZ3M+PHZtLWFyZ3M+PCFbQ0RBVEFbLVhteDIwMjRtIC1EZ3d0LnVzZWFyY2hpdmVzPWZhbHNlXV0+PC92bS1hcmdzPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zc2Uuc2VjdXJpdHkudWkuRW1haWxWYWxpZGF0aW9uPC9lbnRyeS1wb2ludC1tb2R1bGU+PGVudHJ5LXBvaW50LW1vZHVsZT5jb20uc2FwLnNzZS5zZWN1cml0eS51aS5Mb2dpbjwvZW50cnktcG9pbnQtbW9kdWxlPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zc2Uuc2VjdXJpdHkudWkuT0F1dGhMb2dpbjwvZW50cnktcG9pbnQtbW9kdWxlPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zc2Uuc2VjdXJpdHkudWkuVXNlck1hbmFnZW1lbnQ8L2VudHJ5LXBvaW50LW1vZHVsZT48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5zYXAuc3NlLnNlY3VyaXR5LnVpLlJlZ2lzdGVyPC9lbnRyeS1wb2ludC1tb2R1bGU+PGVudHJ5LXBvaW50LW1vZHVsZT5jb20uc2FwLnNzZS5zZWN1cml0eS51aS5FZGl0UHJvZmlsZTwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+
diff --git a/java/com.sap.sse.security.ui/ChangePassword.html b/java/com.sap.sse.security.ui/EditProfile.html
similarity index 95%
rename from java/com.sap.sse.security.ui/ChangePassword.html
rename to java/com.sap.sse.security.ui/EditProfile.html
index abea657ff5e..9d375ffb0aa 100755
--- a/java/com.sap.sse.security.ui/ChangePassword.html
+++ b/java/com.sap.sse.security.ui/EditProfile.html
@@ -25,7 +25,7 @@
     <!-- If you add any GWT meta tags, they must   -->
     <!-- be added before this line.                -->
     <!--                                           -->
-    <script type="text/javascript" language="javascript" src="com.sap.sse.security.ui.ChangePassword/com.sap.sse.security.ui.ChangePassword.nocache.js"></script>
+    <script type="text/javascript" language="javascript" src="com.sap.sse.security.ui.EditProfile/com.sap.sse.security.ui.EditProfile.nocache.js"></script>
   </head>
 
   <!--                                           -->
diff --git a/java/com.sap.sse.security.ui/WEB-INF/web.xml b/java/com.sap.sse.security.ui/WEB-INF/web.xml
index 2048cb68ff2..c4b2d18aef0 100644
--- a/java/com.sap.sse.security.ui/WEB-INF/web.xml
+++ b/java/com.sap.sse.security.ui/WEB-INF/web.xml
@@ -70,7 +70,7 @@
 		<url-pattern>/com.sap.sse.security.ui.OAuthLogin/remote_logging</url-pattern>
 		<url-pattern>/com.sap.sse.security.ui.Login/remote_logging</url-pattern>
 		<url-pattern>/com.sap.sse.security.ui.UserManagement/remote_logging</url-pattern>
-		<url-pattern>/com.sap.sse.security.ui.ChangePassword/remote_logging</url-pattern>
+		<url-pattern>/com.sap.sse.security.ui.EditProfile/remote_logging</url-pattern>
 		<url-pattern>/com.sap.sse.security.ui.EmailValidation/remote_logging</url-pattern>
 	</servlet-mapping>
 </web-app>
diff --git a/java/com.sap.sse.security.ui/build.properties b/java/com.sap.sse.security.ui/build.properties
index b5e6e5a93c0..1e50210bb23 100644
--- a/java/com.sap.sse.security.ui/build.properties
+++ b/java/com.sap.sse.security.ui/build.properties
@@ -12,8 +12,8 @@ bin.includes = META-INF/,\
                com.sap.sse.security.ui.Login/,\
                com.sap.sse.security.ui.Register/,\
                com.sap.sse.security.ui.OAuthLogin/,\
-               ChangePassword.html,\
-               com.sap.sse.security.ui.ChangePassword/,\
+               EditProfile.html,\
+               com.sap.sse.security.ui.EditProfile/,\
                com.sap.sse.security.ui.EmailValidation/,\
                EmailValidation.html
 output.. = WEB-INF/classes/
diff --git a/java/com.sap.sse.security.ui/pom.xml b/java/com.sap.sse.security.ui/pom.xml
index 935e114dbef..70fd5ab79a5 100644
--- a/java/com.sap.sse.security.ui/pom.xml
+++ b/java/com.sap.sse.security.ui/pom.xml
@@ -62,7 +62,7 @@
 								<module>com.sap.sse.security.ui.OAuthLogin</module>
 								<module>com.sap.sse.security.ui.LoginPanel</module>
 								<module>com.sap.sse.security.ui.Register</module>
-								<module>com.sap.sse.security.ui.ChangePassword</module>
+								<module>com.sap.sse.security.ui.EditProfile</module>
 								<module>com.sap.sse.security.ui.EmailValidation</module>
 							</modules>
 							<gen>${basedir}/.generated</gen>
diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/changepassword/ChangePasswordEntryPoint.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/changepassword/EditProfileEntryPoint.java
similarity index 99%
rename from java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/changepassword/ChangePasswordEntryPoint.java
rename to java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/changepassword/EditProfileEntryPoint.java
index 8b070e7e9f3..90023393651 100755
--- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/changepassword/ChangePasswordEntryPoint.java
+++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/changepassword/EditProfileEntryPoint.java
@@ -35,7 +35,7 @@ import com.sap.sse.security.ui.shared.UserDTO;
 import com.sap.sse.security.ui.shared.UserManagementService;
 import com.sap.sse.security.ui.shared.UserManagementServiceAsync;
 
-public class ChangePasswordEntryPoint implements EntryPoint {
+public class EditProfileEntryPoint implements EntryPoint {
     private final UserManagementServiceAsync userManagementService = GWT.create(UserManagementService.class);
     private final StringMessages stringMessages = GWT.create(StringMessages.class);
 
diff --git a/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/ChangePassword.gwt.xml b/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/EditProfile.gwt.xml
similarity index 96%
rename from java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/ChangePassword.gwt.xml
rename to java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/EditProfile.gwt.xml
index ea6a2a8356b..13646725023 100755
--- a/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/ChangePassword.gwt.xml
+++ b/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/EditProfile.gwt.xml
@@ -29,7 +29,7 @@
   <super-source path="jre" />
 
   <!-- Specify the app entry point class.                         -->
-  <entry-point class='com.sap.sse.security.ui.changepassword.ChangePasswordEntryPoint'/>
+  <entry-point class='com.sap.sse.security.ui.changepassword.EditProfileEntryPoint'/>
 
   <set-property name="gwt.logging.enabled" value="TRUE"/> 
   <set-property name="gwt.logging.logLevel" value="FINE"/>
diff --git a/java/com.sap.sse.security.ui/src/main/resources/shiro.ini b/java/com.sap.sse.security.ui/src/main/resources/shiro.ini
index ab5c3fc35d8..6eff61c2e37 100755
--- a/java/com.sap.sse.security.ui/src/main/resources/shiro.ini
+++ b/java/com.sap.sse.security.ui/src/main/resources/shiro.ini
@@ -37,4 +37,4 @@ securityManager.cacheManager = $cacheManager
 [urls]
 /Login.html = anon
 /UserManagement.html = authc,roles[admin]
-/ChangePassword.html = authc
+/EditProfile.html = authc