handle existing users better