diff --git a/themes/so-theme/docroot/_diffs/templates/init_custom.vm b/themes/so-theme/docroot/_diffs/templates/init_custom.vm
index 86fd950f91de..af64511e6f34 100644
--- a/themes/so-theme/docroot/_diffs/templates/init_custom.vm
+++ b/themes/so-theme/docroot/_diffs/templates/init_custom.vm
@@ -1,5 +1,6 @@
-#set ($logo = "logo")
+#set ($user_local_service = $serviceLocator.findService("com.liferay.portal.service.UserLocalService"))
 
+#set ($logo = "logo")
 #set ($user_profile_url = $community_default_public_url)
 #set ($user_dashboard_portlet_url = $site_default_url)
 
@@ -23,8 +24,6 @@
 	$user_dashboard_portlet_url.setWindowState("normal")
 
 	#set ($user_dashboard_url = $htmlUtil.escape($user_dashboard_portlet_url.toString()))
-
-	#set ($user_local_service = $serviceLocator.findService("com.liferay.portal.service.UserLocalService"))
 #end
 
 #if ($page_group.isUser())
diff --git a/themes/so-theme/docroot/_diffs/templates/portal_normal.vm b/themes/so-theme/docroot/_diffs/templates/portal_normal.vm
index 8ae159cef9de..4c0bcb183601 100644
--- a/themes/so-theme/docroot/_diffs/templates/portal_normal.vm
+++ b/themes/so-theme/docroot/_diffs/templates/portal_normal.vm
@@ -24,7 +24,7 @@ $theme.include($body_top_include)
 	<header id="banner" role="banner">
 		<hgroup id="heading">
 			<div class="company-title">
-				<a class="$logo_css_class" href="$site_default_url" title="#language("go-to") $site_name">
+				<a class="$logo_css_class" href="$user_dashboard_url" title='#language("go-to") #language("dashboard")'>
 					<img alt="$logo_description" height="$site_logo_height" src="$site_logo" width="$site_logo_width" />
 				</a>
 			</div>