diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index a8aa3261..ebe1febc 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -553,8 +553,7 @@ module.controller('SettingsCtrl', function($scope, $location, SettingsService) {
 	$scope.save = function() {
 		SettingsService.settings = $scope.settings;
 		SettingsService.save(function() {
-			window.location.href = window.location.href.substring(0,
-					window.location.href.lastIndexOf('#'));
+
 		});
 	};
 });
@@ -570,13 +569,14 @@ module.controller('ProfileCtrl', function($scope, $location, SessionService) {
 			return;
 		}
 		var o = {
-			email : $scope.user.email
+			email : $scope.user.email,
+			password : $scope.user.password
 		};
-		if ($scope.user.password == $scope.password_c) {
-			o.password = $scope.user.password;
-		}
-		SessionService.save(o);
-		$location.path('/');
+
+		SessionService.save(o, function() {
+			$location.path('/');
+		});
+
 	};
 });
 
diff --git a/src/main/webapp/templates/profile.html b/src/main/webapp/templates/profile.html
index c780dae1..f2e63c6a 100644
--- a/src/main/webapp/templates/profile.html
+++ b/src/main/webapp/templates/profile.html
@@ -2,8 +2,6 @@
 	<div class="page-header">
 		<h1>Profile</h1>
 	</div>
-	{{user}}
-	{{profileForm.$valid}}
 	<form name="profileForm" ng-submit="save()" class="form-horizontal">
 		<div class="control-group">
 			<label class="control-label" for="email">E-mail</label>