Heri | #2219: Adding Ramya QA feedback
Heri | #2219: Fix UI on password reset page