diff --git a/packaging/war/src/main/webapp/images/logo/adw_logo.png b/packaging/war/src/main/webapp/images/logo/adw_logo.png
new file mode 100644
index 0000000000..80aa93c45c
Binary files /dev/null and b/packaging/war/src/main/webapp/images/logo/adw_logo.png differ
diff --git a/packaging/war/src/main/webapp/images/logo/hyland_logo.png b/packaging/war/src/main/webapp/images/logo/hyland_logo.png
new file mode 100644
index 0000000000..d2fb4d3d5a
Binary files /dev/null and b/packaging/war/src/main/webapp/images/logo/hyland_logo.png differ
diff --git a/repository/src/main/java/org/alfresco/repo/client/config/ClientAppConfig.java b/repository/src/main/java/org/alfresco/repo/client/config/ClientAppConfig.java
index bc6df000d8..15be7614da 100644
--- a/repository/src/main/java/org/alfresco/repo/client/config/ClientAppConfig.java
+++ b/repository/src/main/java/org/alfresco/repo/client/config/ClientAppConfig.java
@@ -355,6 +355,7 @@ public class ClientAppConfig extends AbstractLifecycleBean
             {
                 return SHARE_PLACEHOLDER;
             }
+            LOGGER.info("INSIDE getClientUrl ****--------------------->"+url);
             return url;
         }
 
@@ -370,8 +371,10 @@ public class ClientAppConfig extends AbstractLifecycleBean
          */
         public String getResolvedClientUrl(SysAdminParams sysAdminParams)
         {
+            System.out.println("Inside getResolvedClientUrl--------------------->");
             String resolvedUrl;
             String clientUrl = getClientUrl();
+            System.out.println("clientUrl is ****--------------------->"+clientUrl);
             if (!StringUtils.isEmpty(clientUrl) && clientUrl.contains(SHARE_PLACEHOLDER))
             {
                 resolvedUrl = UrlUtil.replaceShareUrlPlaceholder(clientUrl, sysAdminParams);
@@ -381,7 +384,7 @@ public class ClientAppConfig extends AbstractLifecycleBean
                 resolvedUrl = UrlUtil.replaceRepoBaseUrlPlaceholder(clientUrl, sysAdminParams);
             }
 
-            LOGGER.debug("Resolved clientUrl [" + clientUrl + "] to [" + resolvedUrl + "] for the client: " + name);
+            System.out.println("))))Resolved clientUrl [" + clientUrl + "] to [" + resolvedUrl + "] for the client: " + name);
             return resolvedUrl;
         }
 
@@ -411,7 +414,8 @@ public class ClientAppConfig extends AbstractLifecycleBean
 
             LOGGER.debug("Resolved template assets [" + getTemplateAssetsUrl() + "] URL to [" + resolvedUrl
                                      + "] for the client: " + name);
-            return resolvedUrl;
+
+            return UrlUtil.replaceRepoBaseUrlPlaceholder(resolvedUrl, sysAdminParams);
         }
 
         public Map<String, String> getProperties()
diff --git a/repository/src/main/resources/alfresco/client/config/repo-clients-apps.properties b/repository/src/main/resources/alfresco/client/config/repo-clients-apps.properties
index 1ad1106fce..fd90b4123a 100644
--- a/repository/src/main/resources/alfresco/client/config/repo-clients-apps.properties
+++ b/repository/src/main/resources/alfresco/client/config/repo-clients-apps.properties
@@ -23,7 +23,7 @@ repo.client-app.share.confirmResetPasswordTemplatePath=
 repo.client-app.workspace.workspaceUrl=${repoBaseUrl}/workspace
 repo.client-app.workspace.inviteModeratedTemplatePath=
 # template assets url for workspace client. i.e. The source url for the images/logo within the email
-repo.client-app.workspace.templateAssetsUrl=${workspaceUrl}/images
+repo.client-app.workspace.templateAssetsUrl=${repoBaseUrl}/alfresco/images/logo
 
 # reset password request email template path
 repo.client-app.workspace.requestResetPasswordTemplatePath=alfresco/templates/reset-password-email-templates/forgot-password-email-template.ftl
diff --git a/repository/src/main/resources/alfresco/templates/reset-password-email-templates/forgot-password-email-template.ftl b/repository/src/main/resources/alfresco/templates/reset-password-email-templates/forgot-password-email-template.ftl
new file mode 100644
index 0000000000..c5a30de681
--- /dev/null
+++ b/repository/src/main/resources/alfresco/templates/reset-password-email-templates/forgot-password-email-template.ftl
@@ -0,0 +1,428 @@
+<html>
+<head>
+    <style type="text/css">
+        td {
+            font-family: 'Helvetica Neue', Arial, sans-serif;
+        }
+
+        body {
+            -webkit-font-smoothing: antialiased;
+            -webkit-text-size-adjust: none;
+            width: 100% ! important;
+            height: 100% !important;
+            color: #727174;
+            font-weight: 400;
+            font-size: 18px;
+            margin: 0;
+        }
+
+        h1 {
+            margin: 10px 0;
+        }
+
+        h2 {
+            color: #727174;
+            font-weight: 600;
+            font-size: 22px;
+        }
+
+        a {
+            color: #0c79bf;
+            text-decoration: underline;
+        }
+
+        a.linkone {
+            color: #0c79bf;
+            text-decoration: underline;
+        }
+
+        .appleLinks a {
+            color: #0c79bf;
+        }
+
+        .appleLinksWhite a {
+            color: #0c79bf;
+        }
+
+        .force-full-width {
+            width: 100% !important;
+        }
+
+        .body-padding {
+            padding: 0 75px
+        }
+
+        .force-width-80 {
+            width: 80% !important;
+        }
+
+        p {
+            Margin-bottom: 1em;
+        }
+
+        .button {
+            text-align: center;
+            font-size: 18px;
+            font-family: sans-serif;
+            font-weight: 400;
+            -webkit-font-smoothing: antialiased;
+            -webkit-text-size-adjust: none;
+        }
+
+        .button a {
+            color: #ffffff;
+            text-decoration: none;
+        }
+
+        img {
+            max-width: 600px;
+            outline: none;
+            text-decoration: none;
+            -ms-interpolation-mode: bicubic;
+        }
+
+        a img {
+            border: none;
+        }
+
+        table {
+            border-collapse: collapse;
+            mso-table-lspace: 0pt;
+            mso-table-rspace: 0pt;
+        }
+
+        #outlook a {
+            padding: 0;
+        }
+
+        .ReadMsgBody {
+            width: 100%;
+        }
+
+        .ExternalClass {
+            width: 100%;
+        }
+
+        .backgroundTable {
+            margin: 0 auto;
+            padding: 0;
+            width: 100% !important;
+        }
+
+        table td {
+            border-collapse: collapse;
+        }
+
+        .ExternalClass * {
+            line-height: 115%;
+        }
+
+        .ExternalClass {
+            vertical-align: middle
+        }
+
+        /*]]>*/
+    </style>
+    <style type="text/css" media="screen">
+        @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { {
+            @-ms-viewport {
+                width: 320px;
+            }
+            @viewport {
+                width: 320px;
+            }
+        }
+    </style>
+    <style type="text/css" media="screen">
+        @media screen {
+            * {
+                font-family: 'Helvetica Neue', 'Arial', 'sans-serif' !important;
+            }
+
+            .w280 {
+                width: 280px !important;
+            }
+        }
+
+    </style>
+    <style type="text/css" media="only screen and (max-width: 480px)">
+        @media only screen and (max-width: 480px) {
+            .full {
+                display: block;
+                width: 100%;
+            }
+
+            table[class*="w320"] {
+                width: 320px !important;
+            }
+
+            td[class*="w320"] {
+                width: 280px !important;
+                padding-left: 20px !important;
+                padding-right: 20px !important;
+            }
+
+            img[class*="w320"] {
+                width: 250px !important;
+                height: 67px !important;
+            }
+
+            td[class*="mobile-spacing"] {
+                padding-top: 10px !important;
+                padding-bottom: 10px !important;
+            }
+
+            *[class*="mobile-hide"] {
+                display: none !important;
+            }
+
+            *[class*="mobile-br"] {
+                font-size: 8px !important;
+            }
+
+            *[class*="mobile-brh"] {
+                font-size: 1px !important;
+            }
+
+            td[class*="mobile-w20"] {
+                width: 20px !important;
+            }
+
+            img[class*="mobile-w20"] {
+                width: 20px !important;
+            }
+
+            td[class*="mobile-center"] {
+                text-align: center !important;
+            }
+
+            table[class*="w100p"] {
+                width: 100% !important;
+            }
+
+            td[class*="activate-now"] {
+                padding-right: 0 !important;
+                padding-top: 20px !important;
+            }
+
+            td[class*="mobile-resize"] {
+                font-size: 22px !important;
+                padding-left: 15px !important;
+            }
+        }
+
+    </style>
+</head>
+<body offset="0" class="body" style="padding:0; margin:0; display:block; background:#f3f4f4; -webkit-text-size-adjust:none; " bgcolor="#EEEEEE">
+<table align="center" cellpadding="0" cellspacing="0" width="100%" height="100%">
+    <tr>
+        <td align="center" valign="top" style="background-color:#f3f4f4; " width="100%">
+            <table cellspacing="0" cellpadding="0" width="600" class="w320">
+                <tr>
+                    <td align="center" valign="top">
+
+                        <!--Snippet Block-->
+                        <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                            <tr>
+                                <td>
+                                    <table border="0" cellspacing="0" cellpadding="10" width="100%" align="center">
+                                        <tbody>
+                                        <tr>
+                                            <td align="left">
+                                                <table align="center" width="100%" border="0" cellspacing="0" cellpadding="0">
+                                                    <tr>
+                                                        <td align="right">
+                                                            <div style="display:none;font-size:1px;color:#333333;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;">
+                                                                -
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+
+                        <!--Header Block-->
+                        <table bgcolor="#FFFFFF" border="0" cellspacing="0" cellpadding="0" align="center" width="100%"
+                               style="border-left:solid 1px #dedee4; border-right:solid 1px #dedee4; border-bottom:solid 1px #dedee4; border-top:solid 1px #dedee4; width:100%!important; min-width:100%;">
+                            <tr style="width:100%;">
+                                <td>
+                                    <table border="0" cellspacing="0" cellpadding="10" align="center" width="100%">
+                                        <tr>
+                                            <td align="left" valign="middle"><a style="color: #ffffff; text-decoration: none;" href=
+                                                "https://www.alfresco.com/" target="_blank"
+                                                ><span style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 24px; color: #727174;"><img
+                                                                style="border:none; display:block; border-collapse:collapse; outline:none; text-decoration:none;"
+                                                                src="${template_assets_url}/hyland_logo.png" border="0"
+                                                                alt="Alfresco" width="122" height="38"></span></a></td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td align="right" bgcolor="#FFFFFF">
+                                    <table border="0" cellspacing="0" cellpadding="10" align="center" width="100%">
+                                        <tr>
+                                            <td align="right" valign="middle"><span
+                                                        style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight:200; color: #727174;">Digital Workspace</span>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+
+                        <!--Break-->
+                        <table width="100%">
+                            <tr>
+                                <td height="10">
+                                    <div class="mobile-br">&nbsp;</div>
+                                </td>
+                            </tr>
+                        </table>
+
+                        <!--Body Block 1-->
+                        <!--Banner Block-->
+                        <table cellspacing="0" cellpadding="0" width="100%" style="border-left:solid 1px #dedee4; border-right:solid 1px #dedee4; ">
+                            <tr>
+                                <td style="border-collapse:collapse; ">
+                                    <table cellspacing="0" cellpadding="0" width="100%" style="background-color:#0c79bf; border:none; ">
+                                        <tr>
+                                            <td style="border-collapse:collapse; ">
+                                                <div class="mktEditable" id="Banner Image 1"><span
+                                                            style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 24px; color: #ffffff;"><img
+                                                                src="${template_assets_url}/adw_logo.png" alt="Alfresco Products" style="width:100%; border:none;
+display:block; border-collapse:collapse; outline:none; text-decoration:none;"></span></div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                        <!--Copy-->
+                        <table cellspacing="0" cellpadding="0" align="center" bgcolor="#FFFFFF"
+                               style="border-left:solid 1px #dedee4; border-right:solid 1px #dedee4; border-bottom:solid 1px #dedee4; " width="100%">
+                            <tr align="center">
+                                <td style="background-color:#ffffff; " align="center">
+                                    <table class="force-width-80" cellspacing="0" cellpadding="12" align="center" bgcolor="#FFFFFF" width="80%">
+                                        <tbody>
+                                        <tr>
+                                            <td align="left">
+                                                <!--Headline Text-->
+                                                <div class="mktEditable" id="Headline Text 1" align="left" style="vertical-align:middle; "><span
+                                                            style="color: #727174; margin: 0px; font-family: Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 22px; font-weight: 600; text-align: left; text-decoration: none; vertical-align:
+middle;"><p>${message("templates.reset-password-email.ftl.title")}</p></span></div>
+                                                <div class="mktEditable" id="Body Text 1" align="left">
+<span style="color:#727174; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:18px;font-weight:400; text-align:left; text-decoration:none; -webkit-text-size-adjust:none;">
+<p>${message("templates.reset-password-email.ftl.detail")}</p>
+</span>
+
+                                                </div>
+
+                                                <!--Break-->
+                                                <table width="100%">
+                                                    <tr>
+                                                        <td height="5">
+                                                            <div class="mobile-br">&nbsp;</div>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+
+                                                <!--Button-->
+                                                <table style="margin:0 auto; " cellspacing="0" cellpadding="0" width="100%">
+                                                    <tr>
+                                                        <td style="text-align:center; margin:0 auto; ">
+                                                            <div><!--[if mso]>
+                                                                <v:rect xmlns:v="urn:schemas-microsoft-com:vml"
+                                                                        xmlns:w="urn:schemas-microsoft-com:office:word"
+                                                                        style="height:45px;v-text-anchor:middle;width:220px;" stroke="f"
+                                                                        fillcolor="#47AA2">
+                                                                    <w:anchorlock/>
+                                                                    <center>
+                                                                <![endif]-->
+                                                                <div class="mktEditable" id="Button Text"><a href="${reset_password_url}" style="background-color:#47aa42; color:#ffffff; display:inline-block; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:18px; font-weight:400; line-height:45px; text-align:center; text-decoration:none; width:220px;
+-webkit-text-size-adjust:none;">${message("templates.reset-password-email.ftl.reset_password_button")}</a></div>
+                                                                <span style="color:#727174; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:12px;font-weight:400; text-align:left; text-decoration:none; -webkit-text-size-adjust:none;">
+<p>${message("templates.reset-password-email.ftl.ignore_message")}</p>
+<span style="color:#727174; font-family:Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size:12px;font-weight:400; text-align:left; text-decoration:none; -webkit-text-size-adjust:none;">
+<hr>
+<p>${message("templates.reset-password-email.ftl.having_trouble_clicking_button")}</p>
+<p><a href="${reset_password_url}">${reset_password_url}</a></p>
+</span>
+                                                                    <!--[if mso]>
+                                                                    </center>
+                                                                    </v:rect>
+                                                                    <![endif]--></div>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+
+                                                <!--Break-->
+                                                <table width="100%">
+                                                    <tr>
+                                                        <td height="5">
+                                                            <div class="mobile-br">&nbsp;</div>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+
+                        <!--Break-->
+                        <table width="100%">
+                            <tr>
+                                <td height="10">
+                                    <div class="mobile-br">&nbsp;</div>
+                                </td>
+                            </tr>
+                        </table>
+
+                        <!--Footer Block-->
+                        <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+                            <tr>
+                                <td align="center">
+                                    <a style="color: #0c79bf; text-decoration: underline;" href="http://www.alfresco.com/company/contact"
+                                       target="_blank"><span
+                                                style="font-family: Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 10px; color: #0c79bf;">${message("templates.generic-email.ftl.contact_us")}</span></a>
+                                    <span style="font-family: Gotham, 'Helvetica Neue', Helvetica, Arial,
+sans-serif; font-size: 10px; color: #b3b3b8;">&copy; ${date?string["yyyy"]} Alfresco Software, Inc.
+                                    ${message("templates.generic-email.ftl.copy_right")}</span><br>
+                                    <span style="font-family: Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 10px; color: #b3b3b8;">Bridge Ave, The Place Maidenhead SL6 1AF United Kingdom</span><br>
+                                    <span style="font-family: Gotham, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 10px; color: #b3b3b8;">1825 S Grant St, Suite 900 San Mateo, CA 94402 USA</span><br>
+                                </td>
+                            </tr>
+                        </table>
+
+                        <!--Break-->
+                        <table width="100%">
+                            <tr>
+                                <td height="10">
+                                    <div class="mobile-br">&nbsp;</div>
+                                </td>
+                            </tr>
+                        </table>
+
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+<!--Litmus Tracking-->
+<table style="display: none;">
+    <tbody>
+    <tr>
+        <td style="width: 0px; display: none; overflow: hidden; max-height: 0px;">{{my.Litmus_Code}}</td>
+    </tr>
+    </tbody>
+</table>
+</body>
+</html>
\ No newline at end of file