diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index 55c80411..39782c08 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -90,7 +90,8 @@
 
         if (!string.IsNullOrEmpty(IconName))
         {
-            _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>&nbsp;";
+            _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>{(IconOnly?"":"&nbsp")}";
+            
         }
 
         _url = EditUrl(Action, _parameters);
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 429ff29f..76874800 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -361,20 +361,26 @@
 
             string panes = "";
             Type themetype = Type.GetType(page.ThemeType);
-            var themeobject = Activator.CreateInstance(themetype) as IThemeControl;
-            if (themeobject != null)
+            if (themetype != null)
             {
-                panes = themeobject.Panes;
-                page.Resources = ManagePageResources(page.Resources, themeobject.Resources);
+                var themeobject = Activator.CreateInstance(themetype) as IThemeControl;
+                if (themeobject != null)
+                {
+                    panes = themeobject.Panes;
+                    page.Resources = ManagePageResources(page.Resources, themeobject.Resources);
+                }
             }
 
             if (!string.IsNullOrEmpty(page.LayoutType))
             {
                 Type layouttype = Type.GetType(page.LayoutType);
-                var layoutobject = Activator.CreateInstance(layouttype) as ILayoutControl;
-                if (layoutobject != null)
+                if (layouttype != null)
                 {
-                    panes = layoutobject.Panes;
+                    var layoutobject = Activator.CreateInstance(layouttype) as ILayoutControl;
+                    if (layoutobject != null)
+                    {
+                        panes = layoutobject.Panes;
+                    }
                 }
             }
 
diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index b0dc919c..6fb3c93b 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -75,7 +75,7 @@ namespace Oqtane.Controllers
 
         private User Filter(User user)
         {
-            if (user != null && !User.IsInRole(Constants.AdminRole) && User.Identity.Name != user.Username)
+            if (user != null && !User.IsInRole(Constants.AdminRole) && User.Identity.Name?.ToLower() != user.Username.ToLower())
             {
                 user.DisplayName = "";
                 user.Email = "";