design-themes-responsive-templates-addons-hybrid_auth-hooks-index-login_buttons.pre.tpl.diff

diff --git a/design/themes/responsive/templates/addons/hybrid_auth/hooks/index/login_buttons.pre.tpl b/design/themes/responsive/templates/addons/hybrid_auth/hooks/index/login_buttons.pre.tpl
index f8e8e87b63..19d7dc005d 100644
--- a/design/themes/responsive/templates/addons/hybrid_auth/hooks/index/login_buttons.pre.tpl
+++ b/design/themes/responsive/templates/addons/hybrid_auth/hooks/index/login_buttons.pre.tpl
@@ -1,20 +1,3 @@
 {if is_array($providers_list)}
-    {hook name="hybrid_auth:login_buttons"}
-    {if !isset($redirect_url)}
-        {$redirect_url = $config.current_url}
-    {/if}
-    {__("hybrid_auth.social_login")}:
-    <p class="ty-text-center">{$smarty.capture.hybrid_auth nofilter}
-    {strip}
-    <input type="hidden" name="redirect_url" value="{$redirect_url}" />
-	{foreach $providers_list as $provider_data}
-        {if $provider_data.status === "ObjectStatuses::ACTIVE"|enum}
-            <a class="cm-login-provider ty-hybrid-auth__icon" data-idp="{$provider_data.provider_id}" data-provider="{$provider_data.provider}">
-                <img src="{$provider_data.icon}" title="{$provider_data.provider}" alt="{$provider_data.provider}" />
-            </a>
-	    {/if}
-    {/foreach}
-    {/strip}
-    </p>
-    {/hook}
-{/if}
\ No newline at end of file
+    {include file="addons/hybrid_auth/views/auth/components/login_buttons.tpl"}
+{/if}

design-themes-responsive-templates-addons-hybrid_auth-hooks-profiles-account_update.post.tpl.diff

diff --git a/design/themes/responsive/templates/addons/hybrid_auth/hooks/profiles/account_update.post.tpl b/design/themes/responsive/templates/addons/hybrid_auth/hooks/profiles/account_update.post.tpl
index 8fc4458eac..09760f92b6 100644
--- a/design/themes/responsive/templates/addons/hybrid_auth/hooks/profiles/account_update.post.tpl
+++ b/design/themes/responsive/templates/addons/hybrid_auth/hooks/profiles/account_update.post.tpl
@@ -1,28 +1,32 @@
 {if $providers_list}
-    {hook name="hybrid_auth:account_update"}
-    {include file="common/subheader.tpl" title=__("hybrid_auth.link_provider")}
-    <p>{__("hybrid_auth.text_link_provider")}</p>
+    {if $auth.user_id}
+        {hook name="hybrid_auth:account_update"}
+            {include file="common/subheader.tpl" title=__("hybrid_auth.link_provider")}
+            <p>{__("hybrid_auth.text_link_provider")}</p>
 
-    <div class="clearfix ty-hybrid-auth__icon-container" id="hybrid_providers">
-        {foreach $providers_list as $provider_data}
-        {if in_array($provider_data.provider, $linked_providers)}
-        <div class="ty-hybrid-auth__icon ty-float-left">
-            <a class="cm-unlink-provider ty-hybrid-auth__remove" data-idp="{$provider_data.provider_id}" data-provider="{$provider_data.provider}"><i class="ty-icon-cancel-circle"></i></a>
-            <img src="{$provider_data.icon}" title="{__("hybrid_auth.linked_provider")}" alt="{$provider_data.provider}"/>
-        </div>
-        {/if}
-        {/foreach}
-        <div class="ty-hybrid-auth__icon ty-float-left">&nbsp;</div>
-        {foreach $providers_list as $provider_data}
-        {if !in_array($provider_data.provider, $linked_providers)}
-        <div class="ty-hybrid-auth__icon ty-float-left">
-            <a class="cm-link-provider ty-link-unlink-provider" data-idp="{$provider_data.provider_id}" data-provider="{$provider_data.provider}">
-                <i class="ty-hybrid-auth__add ty-icon-plus-circle"></i>
-                <img src="{$provider_data.icon}" title="{__("hybrid_auth.not_linked_provider")}" alt="{$provider_data.provider}"/>
-            </a>
-        </div>
-        {/if}
-        {/foreach}
-    <!--hybrid_providers--></div>
-    {/hook}
+            <div class="clearfix ty-hybrid-auth__icon-container" id="hybrid_providers">
+                {foreach $providers_list as $provider_data}
+                    {if in_array($provider_data.provider, $linked_providers)}
+                        <div class="ty-hybrid-auth__icon ty-float-left">
+                            <a class="cm-unlink-provider ty-hybrid-auth__remove" data-idp="{$provider_data.provider_id}" data-provider="{$provider_data.provider}"><i class="ty-icon-cancel-circle"></i></a>
+                            <img src="{$provider_data.icon}" title="{__("hybrid_auth.linked_provider")}" alt="{$provider_data.provider}"/>
+                        </div>
+                    {/if}
+                {/foreach}
+                <div class="ty-hybrid-auth__icon ty-float-left">&nbsp;</div>
+                {foreach $providers_list as $provider_data}
+                    {if !in_array($provider_data.provider, $linked_providers)}
+                        <div class="ty-hybrid-auth__icon ty-float-left">
+                            <a class="cm-link-provider ty-link-unlink-provider" data-idp="{$provider_data.provider_id}" data-provider="{$provider_data.provider}">
+                                <i class="ty-hybrid-auth__add ty-icon-plus-circle"></i>
+                                <img src="{$provider_data.icon}" title="{__("hybrid_auth.not_linked_provider")}" alt="{$provider_data.provider}"/>
+                            </a>
+                        </div>
+                    {/if}
+                {/foreach}
+                <!--hybrid_providers--></div>
+        {/hook}
+    {else}
+        {include file="addons/hybrid_auth/views/auth/components/login_buttons.tpl"}
+    {/if}
 {/if}
\ No newline at end of file

design-themes-responsive-templates-addons-hybrid_auth-views-auth-components-login_buttons.tpl.diff

diff --git a/design/themes/responsive/templates/addons/hybrid_auth/views/auth/components/login_buttons.tpl b/design/themes/responsive/templates/addons/hybrid_auth/views/auth/components/login_buttons.tpl
new file mode 100644
index 0000000000..ac8b477b87
--- /dev/null
+++ b/design/themes/responsive/templates/addons/hybrid_auth/views/auth/components/login_buttons.tpl
@@ -0,0 +1,18 @@
+{hook name="hybrid_auth:login_buttons"}
+    {if !isset($redirect_url)}
+        {$redirect_url = $config.current_url}
+    {/if}
+    {__("hybrid_auth.social_login")}:
+    <p class="ty-text-center">{$smarty.capture.hybrid_auth nofilter}
+        {strip}
+            <input type="hidden" name="redirect_url" value="{$redirect_url}" />
+            {foreach $providers_list as $provider_data}
+                {if $provider_data.status === "ObjectStatuses::ACTIVE"|enum}
+                    <a class="cm-login-provider ty-hybrid-auth__icon" data-idp="{$provider_data.provider_id}" data-provider="{$provider_data.provider}">
+                        <img src="{$provider_data.icon}" title="{$provider_data.provider}" alt="{$provider_data.provider}" />
+                    </a>
+                {/if}
+            {/foreach}
+        {/strip}
+    </p>
+{/hook}