Removed password prompt from inside if statements