diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
index fcfd7fab..4f3b3f65 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
+++ b/Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
@@ -232,7 +232,7 @@
                                         {
                                             if (!string.IsNullOrWhiteSpace(assignedUser.PhoneNumber))
                                             {
-                                                <div id="Device_Show_User_PhoneNumber" title="Phone Number">@assignedUser.PhoneNumber</div>
+                                                <div id="Device_Show_User_PhoneNumber" title="Phone Number"><a href="tel:@assignedUser.PhoneNumber">@assignedUser.PhoneNumber</a></div>
                                             }
                                             if (!string.IsNullOrWhiteSpace(assignedUser.EmailAddress))
                                             {
diff --git a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
index 4fc44d91..75c8b964 100644
--- a/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
+++ b/Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
@@ -1044,16 +1044,29 @@ WriteLiteral(" id=\"Device_Show_User_PhoneNumber\"");
 
 WriteLiteral(" title=\"Phone Number\"");
 
+WriteLiteral("><a");
+
+WriteAttribute("href", Tuple.Create(" href=\"", 13974), Tuple.Create("\"", 14010)
+, Tuple.Create(Tuple.Create("", 13981), Tuple.Create("tel:", 13981), true)
+            
+            #line 235 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
+                                        , Tuple.Create(Tuple.Create("", 13985), Tuple.Create<System.Object, System.Int32>(assignedUser.PhoneNumber
+            
+            #line default
+            #line hidden
+, 13985), false)
+);
+
 WriteLiteral(">");
 
             
             #line 235 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                       Write(assignedUser.PhoneNumber);
+                                                                                                                                               Write(assignedUser.PhoneNumber);
 
             
             #line default
             #line hidden
-WriteLiteral("</div>\r\n");
+WriteLiteral("</a></div>\r\n");
 
             
             #line 236 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
@@ -1072,15 +1085,15 @@ WriteLiteral(" title=\"Email Address\"");
 
 WriteLiteral("><a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 14315), Tuple.Create("\"", 14370)
-, Tuple.Create(Tuple.Create("", 14322), Tuple.Create("mailto:", 14322), true)
+WriteAttribute("href", Tuple.Create(" href=\"", 14359), Tuple.Create("\"", 14414)
+, Tuple.Create(Tuple.Create("", 14366), Tuple.Create("mailto:", 14366), true)
             
             #line 239 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                              , Tuple.Create(Tuple.Create("", 14329), Tuple.Create<System.Object, System.Int32>(Model.Device.AssignedUser.EmailAddress
+                                              , Tuple.Create(Tuple.Create("", 14373), Tuple.Create<System.Object, System.Int32>(Model.Device.AssignedUser.EmailAddress
             
             #line default
             #line hidden
-, 14329), false)
+, 14373), false)
 );
 
 WriteLiteral(">");
@@ -1134,26 +1147,26 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                                                    <i");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 15038), Tuple.Create("\"", 15108)
-, Tuple.Create(Tuple.Create("", 15046), Tuple.Create("flag", 15046), true)
-, Tuple.Create(Tuple.Create(" ", 15050), Tuple.Create("fa", 15051), true)
-, Tuple.Create(Tuple.Create(" ", 15053), Tuple.Create("fa-", 15054), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 15082), Tuple.Create("\"", 15152)
+, Tuple.Create(Tuple.Create("", 15090), Tuple.Create("flag", 15090), true)
+, Tuple.Create(Tuple.Create(" ", 15094), Tuple.Create("fa", 15095), true)
+, Tuple.Create(Tuple.Create(" ", 15097), Tuple.Create("fa-", 15098), true)
             
             #line 247 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 15057), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
+, Tuple.Create(Tuple.Create("", 15101), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
             
             #line default
             #line hidden
-, 15057), false)
-, Tuple.Create(Tuple.Create(" ", 15075), Tuple.Create("fa-fw", 15076), true)
-, Tuple.Create(Tuple.Create(" ", 15081), Tuple.Create("d-", 15082), true)
+, 15101), false)
+, Tuple.Create(Tuple.Create(" ", 15119), Tuple.Create("fa-fw", 15120), true)
+, Tuple.Create(Tuple.Create(" ", 15125), Tuple.Create("d-", 15126), true)
             
             #line 247 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                    , Tuple.Create(Tuple.Create("", 15084), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
+                    , Tuple.Create(Tuple.Create("", 15128), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
             
             #line default
             #line hidden
-, 15084), false)
+, 15128), false)
 );
 
 WriteLiteral(">\r\n                                                        <span");
@@ -1682,39 +1695,39 @@ WriteLiteral("\"");
 
 WriteLiteral(" name=\"DeviceProfile\"");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 24149), Tuple.Create("\"", 24176)
-, Tuple.Create(Tuple.Create("", 24154), Tuple.Create("DeviceProfile_", 24154), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 24193), Tuple.Create("\"", 24220)
+, Tuple.Create(Tuple.Create("", 24198), Tuple.Create("DeviceProfile_", 24198), true)
             
             #line 388 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                     , Tuple.Create(Tuple.Create("", 24168), Tuple.Create<System.Object, System.Int32>(dp.Id
+                                                     , Tuple.Create(Tuple.Create("", 24212), Tuple.Create<System.Object, System.Int32>(dp.Id
             
             #line default
             #line hidden
-, 24168), false)
+, 24212), false)
 );
 
 WriteLiteral(" /><label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 24186), Tuple.Create("\"", 24214)
-, Tuple.Create(Tuple.Create("", 24192), Tuple.Create("DeviceProfile_", 24192), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 24230), Tuple.Create("\"", 24258)
+, Tuple.Create(Tuple.Create("", 24236), Tuple.Create("DeviceProfile_", 24236), true)
             
             #line 388 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                           , Tuple.Create(Tuple.Create("", 24206), Tuple.Create<System.Object, System.Int32>(dp.Id
+                                                                                           , Tuple.Create(Tuple.Create("", 24250), Tuple.Create<System.Object, System.Int32>(dp.Id
             
             #line default
             #line hidden
-, 24206), false)
+, 24250), false)
 );
 
-WriteAttribute("title", Tuple.Create(" title=\"", 24215), Tuple.Create("\"", 24259)
-, Tuple.Create(Tuple.Create("", 24223), Tuple.Create("Distribution:", 24223), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 24259), Tuple.Create("\"", 24303)
+, Tuple.Create(Tuple.Create("", 24267), Tuple.Create("Distribution:", 24267), true)
             
             #line 388 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                                         , Tuple.Create(Tuple.Create(" ", 24236), Tuple.Create<System.Object, System.Int32>(dp.DistributionType
+                                                                                                                         , Tuple.Create(Tuple.Create(" ", 24280), Tuple.Create<System.Object, System.Int32>(dp.DistributionType
             
             #line default
             #line hidden
-, 24237), false)
+, 24281), false)
 );
 
 WriteLiteral(">");
@@ -1924,14 +1937,14 @@ WriteLiteral(" title=\"Warranty Valid Until\"");
 WriteLiteral(">Warranty Until:</span>\r\n                                </td>\r\n                 " +
 "               <td");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 29919), Tuple.Create("\"", 30067)
+WriteAttribute("class", Tuple.Create(" class=\"", 29963), Tuple.Create("\"", 30111)
             
             #line 482 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 29927), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.WarrantyValidUntil.HasValue && Model.Device.DeviceBatch.WarrantyValidUntil.Value < DateTime.Now ? "alert" : null
+, Tuple.Create(Tuple.Create("", 29971), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.WarrantyValidUntil.HasValue && Model.Device.DeviceBatch.WarrantyValidUntil.Value < DateTime.Now ? "alert" : null
             
             #line default
             #line hidden
-, 29927), false)
+, 29971), false)
 );
 
 WriteLiteral(">\r\n");
@@ -1972,14 +1985,14 @@ WriteLiteral(" title=\"Insured Until\"");
 WriteLiteral(">Insured Until:</span>\r\n                                </td>\r\n                  " +
 "              <td");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 30921), Tuple.Create("\"", 31057)
+WriteAttribute("class", Tuple.Create(" class=\"", 30965), Tuple.Create("\"", 31101)
             
             #line 498 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 30929), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.InsuredUntil.HasValue && Model.Device.DeviceBatch.InsuredUntil.Value < DateTime.Now ? "alert" : null
+, Tuple.Create(Tuple.Create("", 30973), Tuple.Create<System.Object, System.Int32>(Model.Device.DeviceBatch.InsuredUntil.HasValue && Model.Device.DeviceBatch.InsuredUntil.Value < DateTime.Now ? "alert" : null
             
             #line default
             #line hidden
-, 30929), false)
+, 30973), false)
 );
 
 WriteLiteral(">\r\n");
@@ -2085,39 +2098,39 @@ WriteLiteral("\"");
 
 WriteLiteral(" name=\"DeviceBatch\"");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 32245), Tuple.Create("\"", 32270)
-, Tuple.Create(Tuple.Create("", 32250), Tuple.Create("DeviceBatch_", 32250), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 32289), Tuple.Create("\"", 32314)
+, Tuple.Create(Tuple.Create("", 32294), Tuple.Create("DeviceBatch_", 32294), true)
             
             #line 518 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                               , Tuple.Create(Tuple.Create("", 32262), Tuple.Create<System.Object, System.Int32>(db.Id
+                                               , Tuple.Create(Tuple.Create("", 32306), Tuple.Create<System.Object, System.Int32>(db.Id
             
             #line default
             #line hidden
-, 32262), false)
+, 32306), false)
 );
 
 WriteLiteral(" /><label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 32280), Tuple.Create("\"", 32306)
-, Tuple.Create(Tuple.Create("", 32286), Tuple.Create("DeviceBatch_", 32286), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 32324), Tuple.Create("\"", 32350)
+, Tuple.Create(Tuple.Create("", 32330), Tuple.Create("DeviceBatch_", 32330), true)
             
             #line 518 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                   , Tuple.Create(Tuple.Create("", 32298), Tuple.Create<System.Object, System.Int32>(db.Id
+                                                                                   , Tuple.Create(Tuple.Create("", 32342), Tuple.Create<System.Object, System.Int32>(db.Id
             
             #line default
             #line hidden
-, 32298), false)
+, 32342), false)
 );
 
-WriteAttribute("title", Tuple.Create(" title=\"", 32307), Tuple.Create("\"", 32363)
-, Tuple.Create(Tuple.Create("", 32315), Tuple.Create("Purchased:", 32315), true)
+WriteAttribute("title", Tuple.Create(" title=\"", 32351), Tuple.Create("\"", 32407)
+, Tuple.Create(Tuple.Create("", 32359), Tuple.Create("Purchased:", 32359), true)
             
             #line 518 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                              , Tuple.Create(Tuple.Create(" ", 32325), Tuple.Create<System.Object, System.Int32>(db.PurchaseDate.ToLongDateString()
+                                                                                                              , Tuple.Create(Tuple.Create(" ", 32369), Tuple.Create<System.Object, System.Int32>(db.PurchaseDate.ToLongDateString()
             
             #line default
             #line hidden
-, 32326), false)
+, 32370), false)
 );
 
 WriteLiteral(">");
@@ -2276,14 +2289,14 @@ WriteLiteral(" id=\"Device_Show_Aspects_Model_Image\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 37110), Tuple.Create("\"", 37220)
+WriteAttribute("src", Tuple.Create(" src=\"", 37154), Tuple.Create("\"", 37264)
             
             #line 595 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-    , Tuple.Create(Tuple.Create("", 37116), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
+    , Tuple.Create(Tuple.Create("", 37160), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 37116), false)
+, 37160), false)
 );
 
 WriteLiteral(" />\r\n                </div>\r\n            </div>\r\n        </td>\r\n    </tr>\r\n    <t" +
@@ -2774,28 +2787,28 @@ WriteLiteral("                                <li>\r\n
 
 WriteLiteral(" type=\"radio\"");
 
-WriteAttribute("id", Tuple.Create(" id=\"", 48785), Tuple.Create("\"", 48863)
-, Tuple.Create(Tuple.Create("", 48790), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 48790), true)
+WriteAttribute("id", Tuple.Create(" id=\"", 48829), Tuple.Create("\"", 48907)
+, Tuple.Create(Tuple.Create("", 48834), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 48834), true)
             
             #line 799 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                           , Tuple.Create(Tuple.Create("", 48837), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
+                           , Tuple.Create(Tuple.Create("", 48881), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
             
             #line default
             #line hidden
-, 48837), false)
+, 48881), false)
 );
 
 WriteLiteral("\r\n                                           name=\"Device_Show_Device_Actions_Dec" +
 "ommission_Reason\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 48962), Tuple.Create("\"", 48996)
+WriteAttribute("value", Tuple.Create(" value=\"", 49006), Tuple.Create("\"", 49040)
             
             #line 800 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                        , Tuple.Create(Tuple.Create("", 48970), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
+                        , Tuple.Create(Tuple.Create("", 49014), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
             
             #line default
             #line hidden
-, 48970), false)
+, 49014), false)
 );
 
 WriteLiteral(" ");
@@ -2809,15 +2822,15 @@ WriteLiteral(" ");
             #line hidden
 WriteLiteral(" />\r\n                                    <label");
 
-WriteAttribute("for", Tuple.Create(" for=\"", 49140), Tuple.Create("\"", 49219)
-, Tuple.Create(Tuple.Create("", 49146), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 49146), true)
+WriteAttribute("for", Tuple.Create(" for=\"", 49184), Tuple.Create("\"", 49263)
+, Tuple.Create(Tuple.Create("", 49190), Tuple.Create("Device_Show_Device_Actions_Decommission_Reason_", 49190), true)
             
             #line 801 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-               , Tuple.Create(Tuple.Create("", 49193), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
+               , Tuple.Create(Tuple.Create("", 49237), Tuple.Create<System.Object, System.Int32>((int)decommissionReason
             
             #line default
             #line hidden
-, 49193), false)
+, 49237), false)
 );
 
 WriteLiteral(">");
diff --git a/Disco.Web/Views/Job/JobParts/_Subject.cshtml b/Disco.Web/Views/Job/JobParts/_Subject.cshtml
index 300c25f7..e968fa4a 100644
--- a/Disco.Web/Views/Job/JobParts/_Subject.cshtml
+++ b/Disco.Web/Views/Job/JobParts/_Subject.cshtml
@@ -455,7 +455,7 @@
                     @if (Authorization.Has(Claims.User.ShowDetails))
                     {
                         if (!string.IsNullOrWhiteSpace(Model.Job.User.PhoneNumber))
-                        {<div id="Job_Show_User_PhoneNumber" title="Phone Number">Phone: @Model.Job.User.PhoneNumber</div>}
+                        {<div id="Job_Show_User_PhoneNumber" title="Phone Number">Phone: <a href="tel:@Model.Job.User.PhoneNumber">@Model.Job.User.PhoneNumber</a></div>}
                     if (!string.IsNullOrWhiteSpace(Model.Job.User.EmailAddress))
                     {<div id="Job_Show_User_EmailAddress" title="Email Address">Email: <a href="mailto:@(Model.Job.User.EmailAddress)">@Model.Job.User.EmailAddress</a></div>}
             }
diff --git a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs
index 0b7706ba..e40d6139 100644
--- a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs
@@ -1746,20 +1746,33 @@ WriteLiteral(" id=\"Job_Show_User_PhoneNumber\"");
 
 WriteLiteral(" title=\"Phone Number\"");
 
-WriteLiteral(">Phone: ");
+WriteLiteral(">Phone: <a");
+
+WriteAttribute("href", Tuple.Create(" href=\"", 31351), Tuple.Create("\"", 31389)
+, Tuple.Create(Tuple.Create("", 31358), Tuple.Create("tel:", 31358), true)
+            
+            #line 458 "..\..\Views\Job\JobParts\_Subject.cshtml"
+                     , Tuple.Create(Tuple.Create("", 31362), Tuple.Create<System.Object, System.Int32>(Model.Job.User.PhoneNumber
+            
+            #line default
+            #line hidden
+, 31362), false)
+);
+
+WriteLiteral(">");
 
             
             #line 458 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                                    Write(Model.Job.User.PhoneNumber);
+                                                                                                                              Write(Model.Job.User.PhoneNumber);
 
             
             #line default
             #line hidden
-WriteLiteral("</div>");
+WriteLiteral("</a></div>");
 
             
             #line 458 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                                                                          }
+                                                                                                                                                                        }
                     if (!string.IsNullOrWhiteSpace(Model.Job.User.EmailAddress))
                     {
             
@@ -1773,15 +1786,15 @@ WriteLiteral(" title=\"Email Address\"");
 
 WriteLiteral(">Email: <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 31556), Tuple.Create("\"", 31600)
-, Tuple.Create(Tuple.Create("", 31563), Tuple.Create("mailto:", 31563), true)
+WriteAttribute("href", Tuple.Create(" href=\"", 31602), Tuple.Create("\"", 31646)
+, Tuple.Create(Tuple.Create("", 31609), Tuple.Create("mailto:", 31609), true)
             
             #line 460 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                       , Tuple.Create(Tuple.Create("", 31570), Tuple.Create<System.Object, System.Int32>(Model.Job.User.EmailAddress
+                       , Tuple.Create(Tuple.Create("", 31616), Tuple.Create<System.Object, System.Int32>(Model.Job.User.EmailAddress
             
             #line default
             #line hidden
-, 31570), false)
+, 31616), false)
 );
 
 WriteLiteral(">");
@@ -1835,26 +1848,26 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                                <i");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 32075), Tuple.Create("\"", 32145)
-, Tuple.Create(Tuple.Create("", 32083), Tuple.Create("flag", 32083), true)
-, Tuple.Create(Tuple.Create(" ", 32087), Tuple.Create("fa", 32088), true)
-, Tuple.Create(Tuple.Create(" ", 32090), Tuple.Create("fa-", 32091), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 32121), Tuple.Create("\"", 32191)
+, Tuple.Create(Tuple.Create("", 32129), Tuple.Create("flag", 32129), true)
+, Tuple.Create(Tuple.Create(" ", 32133), Tuple.Create("fa", 32134), true)
+, Tuple.Create(Tuple.Create(" ", 32136), Tuple.Create("fa-", 32137), true)
             
             #line 467 "..\..\Views\Job\JobParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 32094), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
+, Tuple.Create(Tuple.Create("", 32140), Tuple.Create<System.Object, System.Int32>(flag.Item2.Icon
             
             #line default
             #line hidden
-, 32094), false)
-, Tuple.Create(Tuple.Create(" ", 32112), Tuple.Create("fa-fw", 32113), true)
-, Tuple.Create(Tuple.Create(" ", 32118), Tuple.Create("d-", 32119), true)
+, 32140), false)
+, Tuple.Create(Tuple.Create(" ", 32158), Tuple.Create("fa-fw", 32159), true)
+, Tuple.Create(Tuple.Create(" ", 32164), Tuple.Create("d-", 32165), true)
             
             #line 467 "..\..\Views\Job\JobParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 32121), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
+, Tuple.Create(Tuple.Create("", 32167), Tuple.Create<System.Object, System.Int32>(flag.Item2.IconColour
             
             #line default
             #line hidden
-, 32121), false)
+, 32167), false)
 );
 
 WriteLiteral(">\r\n                                    <span");
@@ -2543,14 +2556,14 @@ WriteLiteral(" type=\"hidden\"");
 
 WriteLiteral(" name=\"JobId\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 46423), Tuple.Create("\"", 46444)
+WriteAttribute("value", Tuple.Create(" value=\"", 46469), Tuple.Create("\"", 46490)
             
             #line 724 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                , Tuple.Create(Tuple.Create("", 46431), Tuple.Create<System.Object, System.Int32>(Model.Job.Id
+                                , Tuple.Create(Tuple.Create("", 46477), Tuple.Create<System.Object, System.Int32>(Model.Job.Id
             
             #line default
             #line hidden
-, 46431), false)
+, 46477), false)
 );
 
 WriteLiteral(" />\r\n");
@@ -2614,26 +2627,26 @@ WriteLiteral("\"");
 
 WriteLiteral(">\r\n                                    <i");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 46913), Tuple.Create("\"", 46980)
-, Tuple.Create(Tuple.Create("", 46921), Tuple.Create("fa", 46921), true)
-, Tuple.Create(Tuple.Create(" ", 46923), Tuple.Create("fa-", 46924), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 46959), Tuple.Create("\"", 47026)
+, Tuple.Create(Tuple.Create("", 46967), Tuple.Create("fa", 46967), true)
+, Tuple.Create(Tuple.Create(" ", 46969), Tuple.Create("fa-", 46970), true)
             
             #line 729 "..\..\Views\Job\JobParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 46927), Tuple.Create<System.Object, System.Int32>(jobQueue.Icon
+, Tuple.Create(Tuple.Create("", 46973), Tuple.Create<System.Object, System.Int32>(jobQueue.Icon
             
             #line default
             #line hidden
-, 46927), false)
-, Tuple.Create(Tuple.Create(" ", 46943), Tuple.Create("fa-fw", 46944), true)
-, Tuple.Create(Tuple.Create(" ", 46949), Tuple.Create("fa-lg", 46950), true)
-, Tuple.Create(Tuple.Create(" ", 46955), Tuple.Create("d-", 46956), true)
+, 46973), false)
+, Tuple.Create(Tuple.Create(" ", 46989), Tuple.Create("fa-fw", 46990), true)
+, Tuple.Create(Tuple.Create(" ", 46995), Tuple.Create("fa-lg", 46996), true)
+, Tuple.Create(Tuple.Create(" ", 47001), Tuple.Create("d-", 47002), true)
             
             #line 729 "..\..\Views\Job\JobParts\_Subject.cshtml"
-   , Tuple.Create(Tuple.Create("", 46958), Tuple.Create<System.Object, System.Int32>(jobQueue.IconColour
+   , Tuple.Create(Tuple.Create("", 47004), Tuple.Create<System.Object, System.Int32>(jobQueue.IconColour
             
             #line default
             #line hidden
-, 46958), false)
+, 47004), false)
 );
 
 WriteLiteral("></i>");
@@ -2674,27 +2687,27 @@ WriteLiteral("                                ");
             #line hidden
 WriteLiteral(" <i");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 47377), Tuple.Create("\"", 47425)
-, Tuple.Create(Tuple.Create("", 47385), Tuple.Create("fa", 47385), true)
-, Tuple.Create(Tuple.Create(" ", 47387), Tuple.Create("d-priority-", 47388), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 47423), Tuple.Create("\"", 47471)
+, Tuple.Create(Tuple.Create("", 47431), Tuple.Create("fa", 47431), true)
+, Tuple.Create(Tuple.Create(" ", 47433), Tuple.Create("d-priority-", 47434), true)
             
             #line 736 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                             , Tuple.Create(Tuple.Create("", 47399), Tuple.Create<System.Object, System.Int32>(priorityValue.ToLower()
+                                                                             , Tuple.Create(Tuple.Create("", 47445), Tuple.Create<System.Object, System.Int32>(priorityValue.ToLower()
             
             #line default
             #line hidden
-, 47399), false)
+, 47445), false)
 );
 
-WriteAttribute("title", Tuple.Create(" title=\"", 47426), Tuple.Create("\"", 47459)
+WriteAttribute("title", Tuple.Create(" title=\"", 47472), Tuple.Create("\"", 47505)
             
             #line 736 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                                                                , Tuple.Create(Tuple.Create("", 47434), Tuple.Create<System.Object, System.Int32>(priorityValue
+                                                                                                                , Tuple.Create(Tuple.Create("", 47480), Tuple.Create<System.Object, System.Int32>(priorityValue
             
             #line default
             #line hidden
-, 47434), false)
-, Tuple.Create(Tuple.Create(" ", 47450), Tuple.Create("Priority", 47451), true)
+, 47480), false)
+, Tuple.Create(Tuple.Create(" ", 47496), Tuple.Create("Priority", 47497), true)
 );
 
 WriteLiteral("></i>\r\n                            </div>\r\n                            <div>\r\n   " +
diff --git a/Disco.Web/Views/User/UserParts/_Subject.cshtml b/Disco.Web/Views/User/UserParts/_Subject.cshtml
index ae475f5b..fd7ae61e 100644
--- a/Disco.Web/Views/User/UserParts/_Subject.cshtml
+++ b/Disco.Web/Views/User/UserParts/_Subject.cshtml
@@ -49,7 +49,7 @@
                                     <td>
                                         @if (!string.IsNullOrEmpty(Model.User.EmailAddress))
                                         {
-                                            <span id="User_Show_Details_Attributes_Email" title="Email Address [Update in Active Directory]">@Model.User.EmailAddress</span>
+                                            <span id="User_Show_Details_Attributes_Email" title="Email Address [Update in Active Directory]"><a href="mailto:@Model.User.EmailAddress">@Model.User.EmailAddress</a></span>
                                         }
                                         else
                                         {
@@ -62,7 +62,7 @@
                                     <td>
                                         @if (!string.IsNullOrEmpty(Model.User.PhoneNumber))
                                         {
-                                            <span id="User_Show_Details_Attributes_Phone" title="Phone Number [Update in Active Directory]">@Model.User.PhoneNumber</span>
+                                            <span id="User_Show_Details_Attributes_Phone" title="Phone Number [Update in Active Directory]"><a href="tel:@Model.User.PhoneNumber">@Model.User.PhoneNumber</a></span>
                                         }
                                         else
                                         {
diff --git a/Disco.Web/Views/User/UserParts/_Subject.generated.cs b/Disco.Web/Views/User/UserParts/_Subject.generated.cs
index 00d95d98..51613f19 100644
--- a/Disco.Web/Views/User/UserParts/_Subject.generated.cs
+++ b/Disco.Web/Views/User/UserParts/_Subject.generated.cs
@@ -246,16 +246,29 @@ WriteLiteral(" id=\"User_Show_Details_Attributes_Email\"");
 
 WriteLiteral(" title=\"Email Address [Update in Active Directory]\"");
 
+WriteLiteral("><a");
+
+WriteAttribute("href", Tuple.Create(" href=\"", 2836), Tuple.Create("\"", 2874)
+, Tuple.Create(Tuple.Create("", 2843), Tuple.Create("mailto:", 2843), true)
+            
+            #line 52 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                                             , Tuple.Create(Tuple.Create("", 2850), Tuple.Create<System.Object, System.Int32>(Model.User.EmailAddress
+            
+            #line default
+            #line hidden
+, 2850), false)
+);
+
 WriteLiteral(">");
 
             
             #line 52 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                                                                                                        Write(Model.User.EmailAddress);
+                                                                                                                                                                                  Write(Model.User.EmailAddress);
 
             
             #line default
             #line hidden
-WriteLiteral("</span>\r\n");
+WriteLiteral("</a></span>\r\n");
 
             
             #line 53 "..\..\Views\User\UserParts\_Subject.cshtml"
@@ -303,16 +316,29 @@ WriteLiteral(" id=\"User_Show_Details_Attributes_Phone\"");
 
 WriteLiteral(" title=\"Phone Number [Update in Active Directory]\"");
 
+WriteLiteral("><a");
+
+WriteAttribute("href", Tuple.Create(" href=\"", 3668), Tuple.Create("\"", 3702)
+, Tuple.Create(Tuple.Create("", 3675), Tuple.Create("tel:", 3675), true)
+            
+            #line 65 "..\..\Views\User\UserParts\_Subject.cshtml"
+                                                                         , Tuple.Create(Tuple.Create("", 3679), Tuple.Create<System.Object, System.Int32>(Model.User.PhoneNumber
+            
+            #line default
+            #line hidden
+, 3679), false)
+);
+
 WriteLiteral(">");
 
             
             #line 65 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                                                                                                       Write(Model.User.PhoneNumber);
+                                                                                                                                                                             Write(Model.User.PhoneNumber);
 
             
             #line default
             #line hidden
-WriteLiteral("</span>\r\n");
+WriteLiteral("</a></span>\r\n");
 
             
             #line 66 "..\..\Views\User\UserParts\_Subject.cshtml"
@@ -569,14 +595,14 @@ WriteLiteral(" class=\"CreateJob_Assignment_Image\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 7258), Tuple.Create("\"", 7379)
+WriteAttribute("src", Tuple.Create(" src=\"", 7346), Tuple.Create("\"", 7467)
             
             #line 121 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                   , Tuple.Create(Tuple.Create("", 7264), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
+                                                   , Tuple.Create(Tuple.Create("", 7352), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 7264), false)
+, 7352), false)
 );
 
 WriteLiteral(@" />
@@ -834,14 +860,14 @@ WriteLiteral(" type=\"hidden\"");
 
 WriteLiteral(" name=\"UserId\"");
 
-WriteAttribute("value", Tuple.Create(" value=\"", 14444), Tuple.Create("\"", 14470)
+WriteAttribute("value", Tuple.Create(" value=\"", 14532), Tuple.Create("\"", 14558)
             
             #line 226 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                  , Tuple.Create(Tuple.Create("", 14452), Tuple.Create<System.Object, System.Int32>(Model.User.UserId
+                                                  , Tuple.Create(Tuple.Create("", 14540), Tuple.Create<System.Object, System.Int32>(Model.User.UserId
             
             #line default
             #line hidden
-, 14452), false)
+, 14540), false)
 );
 
 WriteLiteral(" />\r\n");
@@ -883,26 +909,26 @@ WriteLiteral("\"");
 
 WriteLiteral(">\r\n                                                <i");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 14844), Tuple.Create("\"", 14911)
-, Tuple.Create(Tuple.Create("", 14852), Tuple.Create("fa", 14852), true)
-, Tuple.Create(Tuple.Create(" ", 14854), Tuple.Create("fa-", 14855), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 14932), Tuple.Create("\"", 14999)
+, Tuple.Create(Tuple.Create("", 14940), Tuple.Create("fa", 14940), true)
+, Tuple.Create(Tuple.Create(" ", 14942), Tuple.Create("fa-", 14943), true)
             
             #line 231 "..\..\Views\User\UserParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 14858), Tuple.Create<System.Object, System.Int32>(userFlag.Icon
+, Tuple.Create(Tuple.Create("", 14946), Tuple.Create<System.Object, System.Int32>(userFlag.Icon
             
             #line default
             #line hidden
-, 14858), false)
-, Tuple.Create(Tuple.Create(" ", 14874), Tuple.Create("fa-fw", 14875), true)
-, Tuple.Create(Tuple.Create(" ", 14880), Tuple.Create("fa-lg", 14881), true)
-, Tuple.Create(Tuple.Create(" ", 14886), Tuple.Create("d-", 14887), true)
+, 14946), false)
+, Tuple.Create(Tuple.Create(" ", 14962), Tuple.Create("fa-fw", 14963), true)
+, Tuple.Create(Tuple.Create(" ", 14968), Tuple.Create("fa-lg", 14969), true)
+, Tuple.Create(Tuple.Create(" ", 14974), Tuple.Create("d-", 14975), true)
             
             #line 231 "..\..\Views\User\UserParts\_Subject.cshtml"
-               , Tuple.Create(Tuple.Create("", 14889), Tuple.Create<System.Object, System.Int32>(userFlag.IconColour
+               , Tuple.Create(Tuple.Create("", 14977), Tuple.Create<System.Object, System.Int32>(userFlag.IconColour
             
             #line default
             #line hidden
-, 14889), false)
+, 14977), false)
 );
 
 WriteLiteral("></i>");
@@ -1083,14 +1109,14 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                                            <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 20309), Tuple.Create("\"", 20376)
+WriteAttribute("href", Tuple.Create(" href=\"", 20397), Tuple.Create("\"", 20464)
             
             #line 325 "..\..\Views\User\UserParts\_Subject.cshtml"
-, Tuple.Create(Tuple.Create("", 20316), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Device.Show(assignment.Device.SerialNumber))
+, Tuple.Create(Tuple.Create("", 20404), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Device.Show(assignment.Device.SerialNumber))
             
             #line default
             #line hidden
-, 20316), false)
+, 20404), false)
 );
 
 WriteLiteral(">\r\n                                                <img");
@@ -1099,14 +1125,14 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Image\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 20508), Tuple.Create("\"", 20629)
+WriteAttribute("src", Tuple.Create(" src=\"", 20596), Tuple.Create("\"", 20717)
             
             #line 326 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                     , Tuple.Create(Tuple.Create("", 20514), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
+                                                     , Tuple.Create(Tuple.Create("", 20602), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 20514), false)
+, 20602), false)
 );
 
 WriteLiteral(" />\r\n                                            </a>\r\n");
@@ -1126,14 +1152,14 @@ WriteLiteral(" class=\"User_Show_AssignedDevices_CurrentAssignment_Image\"");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 20941), Tuple.Create("\"", 21062)
+WriteAttribute("src", Tuple.Create(" src=\"", 21029), Tuple.Create("\"", 21150)
             
             #line 331 "..\..\Views\User\UserParts\_Subject.cshtml"
-                                                 , Tuple.Create(Tuple.Create("", 20947), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
+                                                 , Tuple.Create(Tuple.Create("", 21035), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(assignment.Device.DeviceModel.Id, assignment.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 20947), false)
+, 21035), false)
 );
 
 WriteLiteral(" />\r\n");