Merge branch 'hotfix/localisations'
Fixes localisation login not showing if you hit cancel.
Merge branch 'hotfix/localisation_login' into develop