Login with name change working.
Code clean