Merge branch 'hotfix-arshidni-admin'
Increase the expiration limit, and make it possible to request email resend.
Merge branch 'hotfix-retry-page' into develop