Added reset-user, changing function names