diff --git a/flask_security/core.py b/flask_security/core.py
index 597aa00e..ad43f29f 100644
--- a/flask_security/core.py
+++ b/flask_security/core.py
@@ -541,10 +541,10 @@ def init_app(self, app, datastore=None, register_blueprint=None, **kwargs):
             app.register_blueprint(create_blueprint(state, __name__))
             app.context_processor(_context_processor)
 
-        @app.before_first_request
-        def _register_i18n():
-            if '_' not in app.jinja_env.globals:
-                app.jinja_env.globals['_'] = state.i18n_domain.gettext
+        # @app.before_first_request
+        # def _register_i18n():
+        if '_' not in app.jinja_env.globals:
+            app.jinja_env.globals['_'] = state.i18n_domain.gettext
 
         state.render_template = self.render_template
         state.send_mail = self.send_mail
diff --git a/flask_security/decorators.py b/flask_security/decorators.py
index 8eecacd3..37ce39c9 100644
--- a/flask_security/decorators.py
+++ b/flask_security/decorators.py
@@ -12,7 +12,7 @@
 from collections import namedtuple
 from functools import wraps
 
-from flask import Response, _request_ctx_stack, abort, current_app, redirect, \
+from flask import Response, abort, current_app, redirect, \
     request, url_for
 from flask_login import current_user, login_required  # pragma: no flakes
 from flask_principal import Identity, Permission, RoleNeed, identity_changed
@@ -67,7 +67,7 @@ def _check_token():
 
     if user and user.is_authenticated:
         app = current_app._get_current_object()
-        _request_ctx_stack.top.user = user
+        g.user = user
         identity_changed.send(app, identity=Identity(user.id))
         return True
 
@@ -83,7 +83,7 @@ def _check_http_auth():
     if user and user.verify_and_update_password(auth.password):
         _security.datastore.commit()
         app = current_app._get_current_object()
-        _request_ctx_stack.top.user = user
+        g.user = user
         identity_changed.send(app, identity=Identity(user.id))
         return True
 
diff --git a/flask_security/forms.py b/flask_security/forms.py
index 5e974ac0..95b17cc6 100644
--- a/flask_security/forms.py
+++ b/flask_security/forms.py
@@ -12,9 +12,10 @@
 
 import inspect
 
-from flask import Markup, current_app, flash, request
+from flask import current_app, flash, request
 from flask_login import current_user
 from flask_wtf import FlaskForm as BaseForm
+from markupsafe import Markup
 from speaklater import make_lazy_gettext
 from wtforms import BooleanField, Field, HiddenField, PasswordField, \
     StringField, SubmitField, ValidationError, validators