diff --git a/Ombi.UI/Views/Requests/Index.cshtml b/Ombi.UI/Views/Requests/Index.cshtml
index 7199253c7..867e2c3dc 100644
--- a/Ombi.UI/Views/Requests/Index.cshtml
+++ b/Ombi.UI/Views/Requests/Index.cshtml
@@ -191,18 +191,36 @@
                     </a>
                 </div>
                 <br />
-                {{#if_eq type "tv"}}
-                <span>@UI.Search_TV_Show_Status: </span>
-                {{else}}
-                <span>@UI.Search_Movie_Status: </span>
-                {{/if_eq}}
-                <span class="label label-success">{{status}}</span>
-                {{#if denied}}
                 <div>
-                    Denied: <i style="color:red;" class="fa fa-check"></i>
+                    {{#if_eq type "tv"}}
+                    <span>@UI.Search_TV_Show_Status: </span>
+                    {{else}}
+                    <span>@UI.Search_Movie_Status: </span>
+                    {{/if_eq}}
+                    <span class="label label-success">{{status}}</span>
+                </div>
+
+                <div>
+                    <span>Request status: </span>
+                    {{#if available}}
+                    <span class="label label-success">@UI.Search_Available_on_plex</span>
+                    {{else}}
+                    {{#if approved}}
+                    <span class="label label-info">@UI.Search_Processing_Request</span>
+                    {{else if denied}}
+                    <span class="label label-danger">@UI.Search_Request_denied</span>
                     {{#if deniedReason}}
                     <span class="customTooltip" title="{{deniedReason}}"><i class="fa fa-info-circle"></i></span>
                     {{/if}}
+                    {{else}}
+                    <span class="label label-warning">@UI.Search_Pending_approval</span>
+                    {{/if}}
+                    {{/if}}
+                </div>
+                {{#if denied}}
+                <div>
+                    Denied: <i style="color:red;" class="fa fa-check"></i>
+                 
                 </div>
 
                 {{/if}}
@@ -211,26 +229,7 @@
                 {{else}}
                 <div>@UI.Requests_ReleaseDate: {{releaseDate}}</div>
                 {{/if_eq}}
-                {{#unless denied}}
-                <div>
-                    @UI.Common_Approved:
-                    {{#if_eq approved false}}
-                    <i id="{{requestId}}notapproved" class="fa fa-times"></i>
-                    {{/if_eq}}
-                    {{#if_eq approved true}}
-                    <i class="fa fa-check"></i>
-                    {{/if_eq}}
-                </div>
-                {{/unless}}
-                <div>
-                    @UI.Requests_Available
-                    {{#if_eq available false}}
-                    <i id="availableIcon{{requestId}}" class="fa fa-times"></i>
-                    {{/if_eq}}
-                    {{#if_eq available true}}
-                    <i id="availableIcon{{requestId}}" class="fa fa-check"></i>
-                    {{/if_eq}}
-                </div>
+<br/>
 
                 {{#if_eq type "tv"}}
                 {{#if episodes}}
diff --git a/Ombi.UI/Views/UserLogin/Username.cshtml b/Ombi.UI/Views/UserLogin/Username.cshtml
index fd06ae1e2..a62f456ee 100644
--- a/Ombi.UI/Views/UserLogin/Username.cshtml
+++ b/Ombi.UI/Views/UserLogin/Username.cshtml
@@ -6,7 +6,7 @@
     <h1>@UI.UserLogin_Title</h1>
     <div>
         <p>
-            @string.Format(UI.UserLogin_Paragraph, Html.GetMediaServerName())
+            @string.Format(UI.UserLogin_Paragraph, Html.GetMediaServerName().ToHtmlString()).ToString()
         </p>
     </div>
     <div id="contentBody">