diff --git a/view/assets/js/wikilibras.js b/view/assets/js/wikilibras.js
index 5d9db07..442b2ee 100644
--- a/view/assets/js/wikilibras.js
+++ b/view/assets/js/wikilibras.js
@@ -433,10 +433,6 @@
 			_showInitialScreen(true);
 		}
 		
-		if ($("#login-container").html() === "") {
-			$("#login-container").html(
-					$("#main-navbar-collapse .navbar-right li").html());
-		}
 		$("#start-button").off("click").on("click", function() {
 			_showInitialScreen(false);
 			_showConfigurationScreen(true);
@@ -527,12 +523,20 @@
 		// It removes the PyBossa default message
 		$(".row .col-md-12 p").remove();
 	}
+	
+	function _setupLoginContainer() {
+		if ($("#login-container").html() === "") {
+			$("#login-container").html(
+					$("#main-navbar-collapse .navbar-right li").html());
+		}
+	}
 
 	function _loadMainComponents() {
 		dynengine.load();
 		dynworkflow.load();
 		submitSign.setup(upload_signs_url);
 		teachedSigns.setup();
+		_setupLoginContainer();
 	}
 
 	pybossa.presentTask(function(task, deferred) {
--
libgit2 0.21.2