Feature/tidy up login