diff --git a/soi/wsgi.py b/soi/wsgi.py
index a54328fcf45b64449af047825d077184eca5a720..b96e1b2c3eb9649e3e29f1420fd2a9fdb9664302 100644
--- a/soi/wsgi.py
+++ b/soi/wsgi.py
@@ -51,8 +51,8 @@ class SNFOCCIMiddleware(OCCIMiddleware):
         snf_token = environ['HTTP_X_AUTH_TOKEN']
 
         try:
-            snf_project = environ.get(
-                'HTTP_X_SNF_PROJECT', environ['HTTP_X_PROJECT_ID'])
+            snf_project = environ.get('HTTP_X_SNF_PROJECT') or environ[
+                'HTTP_X_PROJECT_ID']
             print 'Project ID provided'
         except KeyError:
             print "No project header, ask Astakos for project ID"