Cleaned up EditUser query