diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileController.js
index 93d3c3fc9e2ebfd73e007cdd00da66bee76928ac..3dcb8b6860862b0c3e56105f0b3d8251aae31c98 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileController.js
@@ -54,9 +54,13 @@ function UserProfileController(mainController, mode) {
 		this.setSettingValue(this._zenodoApiTokenKey, userInformation.zenodoToken);
 		this._mainController.serverFacade.updateUserInformation(userId, userInformation, (function(ok) {
 			if (ok) {
-				Util.showInfo("Profile saved. You will be logged out automatically in order to reload the profile data upon login.", (function() {
-					this._mainController.serverFacade.logout();
-				}).bind(this));
+				if(this.isFileAuthentication()) {
+				    Util.showInfo("Profile saved. You will be logged out automatically in order to reload the profile data upon login.", (function() {
+					    this._mainController.serverFacade.logout();
+				    }).bind(this));
+				} else {
+				    mainController.changeView("showUserProfilePage");
+				}
 			}
 		}).bind(this));
 	}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileView.js
index 65d80e7574d388b5922b96ea0459bc8b35175128..3bc96d0b85e9609399142b5a5e4a50d98d9696f9 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileView.js
@@ -97,12 +97,14 @@ function UserProfileView(userProfileController, userProfileModel) {
     }
 
 	this._getOptionsMenu = function() {
-        var items = [
-            {
+        var items = [];
+        if(this._userProfileController.isFileAuthentication()) {
+            items.push({
                 label : "Change Password",
                 event : this._userProfileController.resetPassword.bind(this._userProfileController),
-            }
-        ];
+            })
+        }
+
         return FormUtil.getOperationsMenu(items);
 	}