diff --git a/Ombi.Api.Interfaces/IMattermostApi.cs b/Ombi.Api.Interfaces/IMattermostApi.cs
index e7db46b75..281902277 100644
--- a/Ombi.Api.Interfaces/IMattermostApi.cs
+++ b/Ombi.Api.Interfaces/IMattermostApi.cs
@@ -2,7 +2,7 @@
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
 //    File: IMattermostApi.cs
-//    Created By: Jamie Rees
+//    Created By: Michel Zaleski
 //   
 //    Permission is hereby granted, free of charge, to any person obtaining
 //    a copy of this software and associated documentation files (the
diff --git a/Ombi.Api.Models/Notifications/MattermostNotificationBody.cs b/Ombi.Api.Models/Notifications/MattermostNotificationBody.cs
index b804352e0..0c5b17685 100644
--- a/Ombi.Api.Models/Notifications/MattermostNotificationBody.cs
+++ b/Ombi.Api.Models/Notifications/MattermostNotificationBody.cs
@@ -2,7 +2,7 @@
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
 //    File: MattermostNotificationBody.cs
-//    Created By: Jamie Rees
+//    Created By: Michel Zaleski
 //   
 //    Permission is hereby granted, free of charge, to any person obtaining
 //    a copy of this software and associated documentation files (the
@@ -37,17 +37,7 @@ namespace Ombi.Api.Models.Notifications
             username = "Ombi";
         }
 
-        [JsonIgnore]
-        private string _username;
-        public string username
-        {
-            get { return _username; }
-            set
-            {
-                if (!string.IsNullOrEmpty(value))
-                    _username = value;
-            }
-        }
+        public string username { get; set; } = "Ombi"; 
         public string channel { get; set; }
         public string text { get; set; }
         public string icon_url { get; set; }
diff --git a/Ombi.Api/MattermostApi.cs b/Ombi.Api/MattermostApi.cs
index c777e824b..9edbef7b6 100644
--- a/Ombi.Api/MattermostApi.cs
+++ b/Ombi.Api/MattermostApi.cs
@@ -2,7 +2,7 @@
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
 //    File: PlexApi.cs
-//    Created By: Jamie Rees
+//    Created By: Michel Zaleski
 //   
 //    Permission is hereby granted, free of charge, to any person obtaining
 //    a copy of this software and associated documentation files (the
diff --git a/Ombi.Services/Notification/MattermostNotification.cs b/Ombi.Services/Notification/MattermostNotification.cs
index 708e8df34..671974bf5 100644
--- a/Ombi.Services/Notification/MattermostNotification.cs
+++ b/Ombi.Services/Notification/MattermostNotification.cs
@@ -2,7 +2,7 @@
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
 //    File: MattermostNotification.cs
-//    Created By: Jamie Rees
+//    Created By: Michel Zaleski
 //   
 //    Permission is hereby granted, free of charge, to any person obtaining
 //    a copy of this software and associated documentation files (the
diff --git a/Ombi.UI/Validators/MattermostSettingsValidator.cs b/Ombi.UI/Validators/MattermostSettingsValidator.cs
index d6c34c434..333762d79 100644
--- a/Ombi.UI/Validators/MattermostSettingsValidator.cs
+++ b/Ombi.UI/Validators/MattermostSettingsValidator.cs
@@ -2,7 +2,7 @@
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
 //    File: MattermostSettingsValidator.cs
-//    Created By: Jamie Rees
+//    Created By: Michel Zaleski
 //   
 //    Permission is hereby granted, free of charge, to any person obtaining
 //    a copy of this software and associated documentation files (the