cleaned up new/updating user and fixed issue #253