Merge branch 'bugfix/password-reset-link-styling' into 'develop'