diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php
index 84e997b97ccfcf085639a343f8f6836d25705be3..5c03b2730b85205aeeaa7168c8449b8d6c7374d1 100644
--- a/interface/lib/classes/tform_actions.inc.php
+++ b/interface/lib/classes/tform_actions.inc.php
@@ -139,7 +139,7 @@ class tform_actions {
                                 session_write_close();
                                 header($redirect);
 							// When a returnto variable is set
-							} elseif ($_SESSION["s"]["form"]["return_to_url"] != '') {
+							} elseif (isset($_SESSION["s"]["form"]["return_to_url"]) && $_SESSION["s"]["form"]["return_to_url"] != '') {
 								$redirect = $_SESSION["s"]["form"]["return_to_url"];
 								$_SESSION["s"]["form"]["return_to_url"] = '';
 								session_write_close();
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 27484d4d8801d28745285e7a8c86b99f6908ef89..d118124f7fef8c2e90938a121dd6fbc451f2cc54 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -203,6 +203,12 @@
     </IfModule>
 
     <IfModule mod_dav_fs.c>
+	  # Do not execute PHP files in webdav directory
+	  <Directory {tmpl_var name='document_root'}/webdav>
+	    <FilesMatch "\.ph(p3?|tml)$">
+          SetHandler None
+        </FilesMatch>
+	  </Directory>
       # DO NOT REMOVE THE COMMENTS!
       # IF YOU REMOVE THEM, WEBDAV WILL NOT WORK ANYMORE!
       # WEBDAV BEGIN
@@ -411,6 +417,12 @@
     </IfModule>
 
     <IfModule mod_dav_fs.c>
+	  # Do not execute PHP files in webdav directory
+	  <Directory {tmpl_var name='document_root'}/webdav>
+	    <FilesMatch "\.ph(p3?|tml)$">
+          SetHandler None
+        </FilesMatch>
+	  </Directory>
       # DO NOT REMOVE THE COMMENTS!
       # IF YOU REMOVE THEM, WEBDAV WILL NOT WORK ANYMORE!
       # WEBDAV BEGIN