diff --git a/shanoir-uploader/src/main/java/org/shanoir/uploader/action/init/AuthenticationManualConfigurationState.java b/shanoir-uploader/src/main/java/org/shanoir/uploader/action/init/AuthenticationManualConfigurationState.java
index 828586086f..fb6def06eb 100644
--- a/shanoir-uploader/src/main/java/org/shanoir/uploader/action/init/AuthenticationManualConfigurationState.java
+++ b/shanoir-uploader/src/main/java/org/shanoir/uploader/action/init/AuthenticationManualConfigurationState.java
@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.shanoir.uploader.ShUpConfig;
+import org.shanoir.uploader.gui.LoginConfigurationPanel;
 import org.shanoir.uploader.gui.ShUpStartupDialog;
 
 @Component
@@ -18,6 +19,9 @@ public class AuthenticationManualConfigurationState implements State {
 	@Autowired
 	private LoginPanelActionListener loginPanelActionListener;
 
+	@Autowired
+	public LoginConfigurationPanel loginPanel;
+
 	public void load(StartupStateContext context) {
 		if(ShUpConfig.username == null) {
 			ShUpStartupDialog shUpStartupDialog = context.getShUpStartupDialog();
@@ -26,7 +30,7 @@ public void load(StartupStateContext context) {
 		} else {
 			logger.info("Credentials found in basic.properties. Username: " + ShUpConfig.username);
 			context.getShUpStartupDialog().updateStartupText("\nUsername: " + ShUpConfig.username);
-			loginPanelActionListener.configure(null, context);
+			loginPanelActionListener.configure(loginPanel, context);
 			loginPanelActionListener.login(ShUpConfig.username, ShUpConfig.password);
 		}
 	}