Smarter Prompt and fixed login bug with password action