* Removed some cruft from the login code. Combined the