diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.400.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.status.ftl
similarity index 54%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.400.ftl
rename to config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.status.ftl
index 6a9bf88ba1..b206c37b31 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.400.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.status.ftl
@@ -3,9 +3,9 @@
    <title>Upload failure</title>
 </head>
 <body>
-<#if (args.failure?exists)>
+<#if (args.failureCallback?exists)>
    <script type="text/javascript">
-      ${args.failure}
+      ${args.failureCallback}.call(${args.failureScope}, {});
    </script>
 </#if>
 </body>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl
index ae6c0aaae5..5c022873cb 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl
@@ -3,9 +3,9 @@
    <title>Upload success</title>
 </head>
 <body>
-<#if (args.success?exists)>
+<#if (args.successCallback?exists)>
    <script type="text/javascript">
-      ${args.success}
+      ${args.successCallback}.call(${args.successScope}, {nodeRef: "${document.nodeRef}"});
    </script>
 </#if>
 </body>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/uploadavatar.post.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/uploadavatar.post.html.ftl
new file mode 100644
index 0000000000..3882a8121c
--- /dev/null
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/profile/uploadavatar.post.html.ftl
@@ -0,0 +1,12 @@
+<html>
+<head>
+   <title>Upload success</title>
+</head>
+<body>
+<#if (args.successCallback?exists)>
+   <script type="text/javascript">
+      ${args.successCallback}.call(${args.successScope}, {nodeRef: "${image.nodeRef}"});
+   </script>
+</#if>
+</body>
+</html>
\ No newline at end of file
