diff --git a/config/alfresco/bootstrap/webscripts/upload.get.html.ftl b/config/alfresco/bootstrap/webscripts/upload.get.html.ftl
index 4dffeaf35c..a1e9fc1abd 100644
--- a/config/alfresco/bootstrap/webscripts/upload.get.html.ftl
+++ b/config/alfresco/bootstrap/webscripts/upload.get.html.ftl
@@ -15,7 +15,7 @@
     </table>
     <p>
     <table>
-      <form action="${url.service}" method="post" enctype="multipart/form-data" charset="utf-8">
+      <form action="${url.service?html}" method="post" enctype="multipart/form-data" charset="utf-8">
         <tr><td>File:<td><input type="file" name="file">
         <tr><td>Title:<td><input name="title">
         <tr><td>Description:<td><input name="desc">
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
index 6fe1a2f69f..621e009251 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
@@ -110,22 +110,6 @@ public class WorkflowInterpreter extends BaseInterpreter
     @Override
     protected void onBootstrap(ApplicationEvent event)
     {
-        try
-        {
-            setCurrentUserName(BaseInterpreter.DEFAULT_ADMIN);
-            
-            if (!transactionService.isReadOnly())
-            {
-                //interpretCommand("var bpm:package package 1"); // only used for testing workflows, causes increment usage/delta
-                interpretCommand("var bpm:assignee person admin");
-            }
-            
-            setCurrentUserName(null);
-        }
-        catch(IOException e)
-        {
-            throw new WorkflowException("Failed to initialise WorkflowInterpreter", e);
-        }
     }
 
     /* (non-Javadoc)