Couple of fixes for the new user functionality