diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 44a017b00..03f26cf97 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -92,6 +92,8 @@
  - Changed navigation, page, macro, and rich editor templates to load more
    quickly.
  - upgrade.pl now deletes temporary files and template cache.
+ - Fixed a bug in the HTMLArea image manager that would not allow users to
+   upload files if the gateway script was not at /index.pl
 
 
 6.1.1
diff --git a/www/extras/htmlArea/popups/insert_image.html b/www/extras/htmlArea/popups/insert_image.html
index 27a305504..f321032d3 100644
--- a/www/extras/htmlArea/popups/insert_image.html
+++ b/www/extras/htmlArea/popups/insert_image.html
@@ -50,6 +50,7 @@ TD.thumbnail { font: 9pt 'MS Shell Dlg', Helvetica, sans-serif; width: 30em; }
 TD.upload { font: 9pt 'MS Shell Dlg', Helvetica, sans-serif; width: 37em; }
 </style>
 
+
 <!-- script copied from original "insert_image.html" -->
 <script defer>
 function _CloseOnEsc() {
@@ -141,7 +142,6 @@ function _isValidNumber(txtBox) {
     }
     return true;
 }
-
 function OKClick() {
     var elmImage;
     var intAlignment;
@@ -266,7 +266,10 @@ var dialogArgs = window.dialogArguments;
                 </tr>
                 <tr>
                   <td colspan="3">
-                    <form name="actions" method="POST" action="/" enctype="multipart/form-data" target="lister">
+		<script>
+    			var dialogArgs = window.dialogArguments;
+                    document.write('<form name="actions" method="POST" action="'+ dialogArgs[1] +'" enctype="multipart/form-data" target="lister">');
+		</script>
                       <table border="0" cellpadding="0" cellspacing="0">
                         <tr>
                           <td class="upload" colspan="2">