diff --git a/services/web/app/coffee/Features/Compile/ClsiCookieManager.coffee b/services/web/app/coffee/Features/Compile/ClsiCookieManager.coffee
index 81e2e633e6..3372f9c871 100644
--- a/services/web/app/coffee/Features/Compile/ClsiCookieManager.coffee
+++ b/services/web/app/coffee/Features/Compile/ClsiCookieManager.coffee
@@ -56,7 +56,7 @@ module.exports = ClsiCookieManager =
 			if err?
 				logger.err err:err, project_id:project_id, "error getting server id"
 				return callback(err)
-			serverCookie = request.cookie("clsiserver=#{serverId}")
+			serverCookie = request.cookie("#{Settings.clsiCookieKey}=#{serverId}")
 			jar = request.jar()
 			jar.setCookie serverCookie, Settings.apis.clsi.url
 			callback(null, jar)
diff --git a/services/web/test/UnitTests/coffee/Compile/ClsiCookieManagerTests.coffee b/services/web/test/UnitTests/coffee/Compile/ClsiCookieManagerTests.coffee
index 1fc8716657..c2feb2a2c2 100644
--- a/services/web/test/UnitTests/coffee/Compile/ClsiCookieManagerTests.coffee
+++ b/services/web/test/UnitTests/coffee/Compile/ClsiCookieManagerTests.coffee
@@ -112,9 +112,9 @@ describe "ClsiCookieManager", ->
 			@ClsiCookieManager._getServerId = sinon.stub().callsArgWith(1, null, "clsi-11")
 
 		it "should return a jar with the cookie set populated from redis", (done)->
-			@ClsiCookieManager.getCookieJar @project_id, (err, jar)->
-				jar._jar.store.idx["clsi.example.com"]["/"].clsiserver.key.should.equal "clsiserver"
-				jar._jar.store.idx["clsi.example.com"]["/"].clsiserver.value.should.equal "clsi-11"
+			@ClsiCookieManager.getCookieJar @project_id, (err, jar)=>
+				jar._jar.store.idx["clsi.example.com"]["/"][@settings.clsiCookieKey].key.should.equal 
+				jar._jar.store.idx["clsi.example.com"]["/"][@settings.clsiCookieKey].value.should.equal "clsi-11"
 				done()