cleaned up user lookup