diff --git a/src/ozones/Server/ozones-server.rb b/src/ozones/Server/ozones-server.rb
index 9315b2cc3d..ef34108ee0 100755
--- a/src/ozones/Server/ozones-server.rb
+++ b/src/ozones/Server/ozones-server.rb
@@ -159,10 +159,13 @@ end
 
 before do
     unless request.path=='/login' || request.path=='/'
-        rc , msg = build_session unless authorized?
 
-        if rc == 401
-           halt 401 
+        unless authorized?
+            rc , msg = build_session
+
+            if rc == 401
+               halt 401 
+            end
         end
 
         @OzonesServer = OzonesServer.new(session[:key])