Added Validation to Change Password Page
Merge branch 'grant'