Make login less clunky