User revamped. Login revamped