diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 24176a87a..7d83325a4 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -43,10 +43,9 @@
- unless @landing_page
= include_javascripts :main
- -if current_user
- :javascript
- Diaspora.I18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}");
- Diaspora.Page = "#{params[:controller].camelcase}#{params[:action].camelcase}";
+ :javascript
+ Diaspora.I18n.loadLocale(#{get_javascript_strings_for(I18n.locale).to_json}, "#{I18n.locale}");
+ Diaspora.Page = "#{params[:controller].camelcase}#{params[:action].camelcase}";
- if current_user
= include_javascripts :flash_socket #unless modern_browser?
= javascript_include_tag 'web-socket-receiver'