Modified login and register - Seems to be complete now for both