diff --git a/src/config.c b/src/config.c
index 640aa97..0881bfc 100644
--- a/src/config.c
+++ b/src/config.c
@@ -271,7 +271,7 @@ void config_defaults()
 	config.blank_box = true;
 	config.blank_password = false;
 	config.console_dev = strdup("/dev/console");
-	config.default_input = PASSWORD_INPUT;
+	config.default_input = LOGIN_INPUT;
 	config.fg = 9;
 	config.hide_borders = false;
 	config.input_len = 34;
diff --git a/src/main.c b/src/main.c
index 7cc0d69..2b9832d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -135,7 +135,15 @@ int main(int argc, char** argv)
 	// init visible elements
 	struct tb_event event;
 	struct term_buf buf;
-	uint8_t active_input = config.default_input;
+	
+	//Place the curser on the login field if there is no saved username, if there is, place the curser on the password field
+	uint8_t active_input;
+        if (config.default_input == LOGIN_INPUT && login.text != login.end){
+        	active_input = PASSWORD_INPUT;
+        }
+        else{
+        	active_input = config.default_input;
+        }
 
 
 	// init drawing stuff