diff --git a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
index 9aabe7648b..4c056783c8 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
@@ -99,7 +99,7 @@
 		<#if !first>,<#else><#local first = false></#if>"${key}":
 		<#if isUser && object.isTemplateContent(val)>"${val.content}"
 		<#elseif object.isTemplateNodeRef(val)>"${val.nodeRef}"
-		<#elseif val?is_date>"${val?datetime}"
+		<#elseif val?is_date>"${val?datetime?string}"
 		<#elseif val?is_boolean>${val?string}
 		<#else>"${val}"
 		</#if>
diff --git a/source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java b/source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java
index 5cee6ff22e..9822845d7a 100644
--- a/source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java
+++ b/source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java
@@ -117,7 +117,7 @@ public class ChangePasswordPost extends DeclarativeWebScript
         }
         catch (AuthenticationException err)
         {
-            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR,
+            throw new WebScriptException(Status.STATUS_UNAUTHORIZED,
                     "Do not have appropriate auth or wrong auth details provided.");
         }
         catch (JSONException jErr)