ENH Slightly better login system