Fixed changing users sometimes not working

public_html/js/Presenters/UserPresenter.js

@@ -19,21 +19,26 @@ App.Presenters.UserPresenter = function(
 	var $messages = $el;
 	var templates = {};
 	var user;
-	var userName;
+	var userName = null;
 	var activeTab;
 
 	function init(args, loaded) {
+		promise.wait(util.promiseTemplate('user'))
+			.then(function(template, response) {
+				$messages = $el.find('.messages');
+				templates.user = template;
+				reinit(args, loaded);
+			});
+	}
+
+	function reinit(args, loaded) {
+		if (args.userName !== userName) {
 			userName = args.userName;
 			topNavigationPresenter.select(auth.isLoggedIn(userName) ? 'my-account' : 'users');
 			topNavigationPresenter.changeTitle(userName);
 
-		promise.wait(
+			promise.wait(api.get('/users/' + userName))
-				util.promiseTemplate('user'),
+				.then(function(response) {
-				api.get('/users/' + userName))
-			.then(function(template, response) {
-				$messages = $el.find('.messages');
-				templates.user = template;
-
 					user = response.json;
 					var extendedContext = _.extend(args, {user: user});
 
@@ -42,7 +47,8 @@ App.Presenters.UserPresenter = function(
 						[userAccountSettingsPresenter, _.extend({}, extendedContext, {target: '#account-settings-target'})],
 						[userAccountRemovalPresenter, _.extend({}, extendedContext, {target: '#account-removal-target'})]],
 						function() {
-						reinit(args, loaded);
+							initTabs(args);
+							loaded();
 						});
 
 				}).fail(function(response) {
@@ -50,12 +56,12 @@ App.Presenters.UserPresenter = function(
 					messagePresenter.showError($messages, response.json && response.json.error || response);
 					loaded();
 				});
-	}
 
-	function reinit(args, loaded) {
+		} else {
 			initTabs(args);
 			loaded();
 		}
+	}
 
 	function initTabs(args) {
 		activeTab = args.tab || 'basic-info';