Moved functionality from password_first to password_init