Fix user save for existing user, add shell