Fix for https://github.com/TeamMentor/TM_4_0_Design/issues/124
Merge branch 'Issue_124_Forgot_Pwd_Link'