Added User Validation Fixes #2