diff --git a/pillar/web/main/routes.py b/pillar/web/main/routes.py
index 52d538cb..2d8dfa10 100644
--- a/pillar/web/main/routes.py
+++ b/pillar/web/main/routes.py
@@ -10,7 +10,7 @@ from flask import current_app
 from flask import render_template
 from flask import redirect
 from flask import request
-from flask.ext.login import current_user
+from flask_login import current_user
 from werkzeug.contrib.atom import AtomFeed
 
 from pillar.web.utils import system_util
diff --git a/pillar/web/nodes/custom/comments.py b/pillar/web/nodes/custom/comments.py
index e326a073..731f5bf9 100644
--- a/pillar/web/nodes/custom/comments.py
+++ b/pillar/web/nodes/custom/comments.py
@@ -3,8 +3,7 @@ from flask import current_app
 from flask import request
 from flask import jsonify
 from flask import render_template
-from flask.ext.login import login_required
-from flask.ext.login import current_user
+from flask_login import login_required, current_user
 from pillarsdk import Node
 from pillarsdk import Project
 import werkzeug.exceptions as wz_exceptions
diff --git a/pillar/web/nodes/custom/groups.py b/pillar/web/nodes/custom/groups.py
index fcada244..b278446a 100644
--- a/pillar/web/nodes/custom/groups.py
+++ b/pillar/web/nodes/custom/groups.py
@@ -1,7 +1,6 @@
 from flask import request
 from flask import jsonify
-from flask.ext.login import login_required
-from flask.ext.login import current_user
+from flask_login import login_required, current_user
 from pillarsdk import Node
 from pillar.web.utils import system_util
 from ..routes import blueprint
diff --git a/pillar/web/nodes/custom/posts.py b/pillar/web/nodes/custom/posts.py
index 0f8e0c07..31248689 100644
--- a/pillar/web/nodes/custom/posts.py
+++ b/pillar/web/nodes/custom/posts.py
@@ -4,8 +4,7 @@ from pillarsdk.exceptions import ResourceNotFound
 from flask import abort
 from flask import render_template
 from flask import redirect
-from flask.ext.login import login_required
-from flask.ext.login import current_user
+from flask_login import login_required, current_user
 from pillar.web.utils import system_util
 from pillar.web.utils import attach_project_pictures
 from pillar.web.utils import get_file
diff --git a/pillar/web/nodes/routes.py b/pillar/web/nodes/routes.py
index 2a8eed55..49eb8542 100644
--- a/pillar/web/nodes/routes.py
+++ b/pillar/web/nodes/routes.py
@@ -19,7 +19,7 @@ from flask import abort
 from flask_login import current_user
 from werkzeug.exceptions import NotFound
 from wtforms import SelectMultipleField
-from flask.ext.login import login_required
+from flask_login import login_required
 from jinja2.exceptions import TemplateNotFound
 
 from pillar.web.utils import caching
diff --git a/pillar/web/notifications/__init__.py b/pillar/web/notifications/__init__.py
index a08edd3a..97fc6082 100644
--- a/pillar/web/notifications/__init__.py
+++ b/pillar/web/notifications/__init__.py
@@ -4,8 +4,7 @@ from flask import Blueprint
 from flask import request
 from flask import url_for
 from flask import abort
-from flask.ext.login import login_required
-from flask.ext.login import current_user
+from flask_login import login_required, current_user
 from pillarsdk.activities import Notification
 from pillarsdk.activities import ActivitySubscription
 from pillar.web.utils import system_util
diff --git a/pillar/web/projects/routes.py b/pillar/web/projects/routes.py
index 36db6e32..0fee5a77 100644
--- a/pillar/web/projects/routes.py
+++ b/pillar/web/projects/routes.py
@@ -13,8 +13,7 @@ from flask import session
 from flask import abort
 from flask import redirect
 from flask import url_for
-from flask.ext.login import login_required
-from flask.ext.login import current_user
+from flask_login import login_required, current_user
 import werkzeug.exceptions as wz_exceptions
 
 from pillar.web import system_util
diff --git a/pillar/web/system_util.py b/pillar/web/system_util.py
index f0e0747b..1bc3e0ca 100644
--- a/pillar/web/system_util.py
+++ b/pillar/web/system_util.py
@@ -5,7 +5,7 @@ Replacement of the old SystemUtility class.
 import os
 import logging
 from flask import current_app, session
-from flask.ext.login import current_user
+from flask_login import current_user
 
 from pillar.sdk import FlaskInternalApi
 
diff --git a/pillar/web/users/forms.py b/pillar/web/users/forms.py
index fa775c9f..fb272fdf 100644
--- a/pillar/web/users/forms.py
+++ b/pillar/web/users/forms.py
@@ -1,4 +1,4 @@
-from flask.ext.login import current_user
+from flask_login import current_user
 from flask_wtf import Form
 from pillar.web import system_util
 from pillarsdk.users import User
diff --git a/pillar/web/utils/__init__.py b/pillar/web/utils/__init__.py
index f8fe796d..75893677 100644
--- a/pillar/web/utils/__init__.py
+++ b/pillar/web/utils/__init__.py
@@ -6,7 +6,7 @@ import sys
 
 from flask import current_app
 from flask import request
-from flask.ext.login import current_user
+from flask_login import current_user
 from pillarsdk import File
 from pillarsdk import Project
 from pillarsdk.exceptions import ResourceNotFound
diff --git a/pillar/web/utils/forms.py b/pillar/web/utils/forms.py
index 563462db..d0770d29 100644
--- a/pillar/web/utils/forms.py
+++ b/pillar/web/utils/forms.py
@@ -4,7 +4,7 @@ from markupsafe import Markup
 
 from pillarsdk import File
 from flask import current_app
-from flask.ext.login import current_user
+from flask_login import current_user
 from wtforms import Form
 from wtforms import StringField
 from wtforms import SelectField