diff --git a/Oqtane.Client/Themes/Controls/Theme/Login.razor b/Oqtane.Client/Themes/Controls/Theme/Login.razor
index f1bf1ebc..3d9ee0c1 100644
--- a/Oqtane.Client/Themes/Controls/Theme/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/Login.razor
@@ -3,31 +3,29 @@
 @inject IStringLocalizer<Login> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<span class="app-login">
-    @if (PageState.User != null)
+@if (PageState.User != null)
+{
+    @if (PageState.Runtime == Runtime.Hybrid)
     {
-        @if (PageState.Runtime == Runtime.Hybrid)
-        {
-            <button type="button" class="@CssClass" @onclick="LogoutUser">@Localizer["Logout"]</button>
-        }
-        else
-        {
-            <form method="post" class="app-form-inline" action="@logouturl" @formname="LogoutForm">
-                <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
-                <input type="hidden" name="returnurl" value="@returnurl" />
-                <input type="hidden" name="everywhere" value="@everywhere" />
-                <button type="submit" class="@CssClass">@Localizer["Logout"]</button>
-            </form>
-        }
+        <button type="button" class="@CssClass app-login" @onclick="LogoutUser">@Localizer["Logout"]</button>
     }
     else
     {
-        @if (ShowLogin)
-        {
-            <a href="@loginurl" class="@CssClass">@SharedLocalizer["Login"]</a>
-        }
+        <form method="post" class="app-form-inline app-login" action="@logouturl" @formname="LogoutForm">
+            <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+            <input type="hidden" name="returnurl" value="@returnurl" />
+            <input type="hidden" name="everywhere" value="@everywhere" />
+            <button type="submit" class="@CssClass">@Localizer["Logout"]</button>
+        </form>
     }
-</span>
+}
+else
+{
+    @if (ShowLogin)
+    {
+        <a href="@loginurl" class="@CssClass app-login">@SharedLocalizer["Login"]</a>
+    }
+}
 
 @code
 {
diff --git a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
index e99eada5..43c2677d 100644
--- a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
@@ -5,19 +5,17 @@
 @inject IStringLocalizer<UserProfile> Localizer
 @inject NavigationManager NavigationManager
 
-<span class="app-profile">
-    @if (PageState.User != null)
+@if (PageState.User != null)
+{
+    <a href="@_profileurl" class="@CssClass app-profile">@PageState.User.Username</a>
+}
+else
+{
+    @if (ShowRegister && PageState.Site.AllowRegistration)
     {
-        <a href="@_profileurl" class="@CssClass">@PageState.User.Username</a>
+        <a href="@_registerurl" class="@CssClass app-profile">@Localizer["Register"]</a>
     }
-    else
-    {
-        @if (ShowRegister && PageState.Site.AllowRegistration)
-        {
-            <a href="@_registerurl" class="@CssClass">@Localizer["Register"]</a>
-        }
-    }
-</span>
+}
 
 @code {