Simplify login further