Merged user module updates from Deadeyes-star.com development