diff --git a/ui/javascripts/app/router.js b/ui/javascripts/app/router.js
index 77a4a8421b..515371148c 100644
--- a/ui/javascripts/app/router.js
+++ b/ui/javascripts/app/router.js
@@ -8,7 +8,9 @@ Ember.Application.initializer({
 
   initialize: function(container, application) {
     application.set('settings', App.Settings.create());
-    App.set('settings.token', '');
+	if (App.get('settings.token') === undefined) {
+		App.set('settings.token', '');
+	}
   }
 });