Merge "Fixed timestamp comparison in fixUserRegistration"