Simplify password logic