Even better login / register

v2