diff --git a/geonode/decorators.py b/geonode/decorators.py
index 254e9cd6b7f..345754c922a 100644
--- a/geonode/decorators.py
+++ b/geonode/decorators.py
@@ -65,7 +65,7 @@ def view_or_basicauth(view, request, test_func, realm="", *args, **kwargs):
     are already logged in or if they have provided proper http-authorization
     and returning the view if all goes well, otherwise responding with a 401.
     """
-    if test_func(auth.get_user(request)):
+    if test_func(request.user):
         # Already logged in, just return the view.
         #
         return view(request, *args, **kwargs)
diff --git a/geonode/upload/views.py b/geonode/upload/views.py
index 19d8fffdeea..b586c66fc09 100644
--- a/geonode/upload/views.py
+++ b/geonode/upload/views.py
@@ -42,7 +42,6 @@
 
 from http.client import BadStatusLine
 
-from django.contrib import auth
 from django.conf import settings
 from django.shortcuts import render
 from django.utils.html import escape
@@ -651,8 +650,6 @@ def final_step_view(req, upload_session):
 @logged_in_or_basicauth(realm="GeoNode")
 def view(req, step=None):
     """Main uploader view"""
-    if not auth.get_user(req).is_authenticated:
-        return error_response(req, errors=["Not Authorized"])
 
     config = Configuration.load()
     if config.read_only or config.maintenance: