diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 1dcc2d19a..42bbefb03 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -97,6 +97,7 @@ if (!$user->isAdmin()) {
 /* Update cookie lifetime */
 if($settings->_cookieLifetime) {
 	$lifetime = time() + intval($settings->_cookieLifetime);
-	setcookie("mydms_session", $dms_session, $lifetime, $settings->_httpRoot, null, null, true);
+	/* Turn off http only cookies if jumploader is enabled */
+	setcookie("mydms_session", $dms_session, $lifetime, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload);
 }
 ?>
diff --git a/op/op.Login.php b/op/op.Login.php
index 41881a30e..aa5a455e3 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -245,7 +245,8 @@ if (isset($_COOKIE["mydms_session"])) {
 	/* Load session */
 	$dms_session = $_COOKIE["mydms_session"];
 	if(!$resArr = $session->load($dms_session)) {
-		setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, null, null, true); //delete cookie
+		/* Turn off http only cookies if jumploader is enabled */
+		setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload); //delete cookie
 		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 		exit;
 	} else {
@@ -263,7 +264,7 @@ if (isset($_COOKIE["mydms_session"])) {
 		$lifetime = time() + intval($settings->_cookieLifetime);
 	else
 		$lifetime = 0;
-	setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, null, true);
+	setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload);
 }
 
 // TODO: by the PHP manual: The superglobals $_GET and $_REQUEST  are already decoded.