Passwords and location bug fix