User Forms cleaned up, error messages