diff --git a/src/Ombi.Core/IdentityResolver/IUserIdentityManager.cs b/src/Ombi.Core/IdentityResolver/IUserIdentityManager.cs
index 9867a0f92..0a47828bc 100644
--- a/src/Ombi.Core/IdentityResolver/IUserIdentityManager.cs
+++ b/src/Ombi.Core/IdentityResolver/IUserIdentityManager.cs
@@ -11,6 +11,7 @@ namespace Ombi.Core.IdentityResolver
         Task<bool> CredentialsValid(string username, string password);
 
         Task<UserDto> GetUser(string username);
+        Task<UserDto> GetUser(int userId);
 
         Task<IEnumerable<UserDto>> GetUsers();
 
diff --git a/src/Ombi.Core/IdentityResolver/UserIdentityManager.cs b/src/Ombi.Core/IdentityResolver/UserIdentityManager.cs
index dc8765b93..2802d70e5 100644
--- a/src/Ombi.Core/IdentityResolver/UserIdentityManager.cs
+++ b/src/Ombi.Core/IdentityResolver/UserIdentityManager.cs
@@ -36,6 +36,10 @@ namespace Ombi.Core.IdentityResolver
         {
             return Mapper.Map<UserDto>(await UserRepository.GetUser(username));
         }
+        public async Task<UserDto> GetUser(int userId)
+        {
+            return Mapper.Map<UserDto>(await UserRepository.GetUser(userId));
+        }
 
         public async Task<IEnumerable<UserDto>> GetUsers()
         {
diff --git a/src/Ombi.Store/Repository/IUserRepository.cs b/src/Ombi.Store/Repository/IUserRepository.cs
index 8a1ee1c47..e61cb4f57 100644
--- a/src/Ombi.Store/Repository/IUserRepository.cs
+++ b/src/Ombi.Store/Repository/IUserRepository.cs
@@ -11,5 +11,6 @@ namespace Ombi.Store.Repository
         Task<IEnumerable<User>> GetUsers();
         Task DeleteUser(User user);
         Task<User> UpdateUser(User user);
+        Task<User> GetUser(int userId);
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Store/Repository/UserRepository.cs b/src/Ombi.Store/Repository/UserRepository.cs
index 9d7230510..df1ea5574 100644
--- a/src/Ombi.Store/Repository/UserRepository.cs
+++ b/src/Ombi.Store/Repository/UserRepository.cs
@@ -50,6 +50,13 @@ namespace Ombi.Store.Repository
             return user;
         }
 
+        public async Task<User> GetUser(int userId)
+        {
+            var user = await Db.Users.FirstOrDefaultAsync(x => x.Id == userId);
+            Db.Entry(user).Reload();
+            return user;
+        }
+
         public async Task CreateUser(User user)
         {
             Db.Users.Add(user);
diff --git a/src/Ombi/ClientApp/app/login/login.component.html b/src/Ombi/ClientApp/app/login/login.component.html
index 76b627235..e44985851 100644
--- a/src/Ombi/ClientApp/app/login/login.component.html
+++ b/src/Ombi/ClientApp/app/login/login.component.html
@@ -6,7 +6,8 @@ include the remember me checkbox
     <div class="container" id="login">
         <div class="card card-container">
             <!-- <img class="profile-img-card" src="//lh3.googleusercontent.com/-6V8xOA6M7BA/AAAAAAAAAAI/AAAAAAAAAAA/rzlHcD0KYwo/photo.jpg?sz=120" alt="" /> -->
-            <img id="profile-img" class="profile-img-card" src="/images/logo.png" />
+            <div *ngIf="!customizationSettings.logo"><img id="profile-img" class="profile-img-card" src="/images/logo.png" /></div>
+            <div *ngIf="customizationSettings.logo"><img id="profile-img" class="profile-img-card" [src]="customizationSettings.logo" /></div>
             <p id="profile-name" class="profile-name-card"></p>
 
             <form class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
diff --git a/src/Ombi/ClientApp/app/login/login.component.ts b/src/Ombi/ClientApp/app/login/login.component.ts
index efe806462..a71a704c0 100644
--- a/src/Ombi/ClientApp/app/login/login.component.ts
+++ b/src/Ombi/ClientApp/app/login/login.component.ts
@@ -5,6 +5,8 @@ import { FormGroup, Validators, FormBuilder } from '@angular/forms';
 import { AuthService } from '../auth/auth.service';
 import { StatusService } from '../services/status.service';
 import { NotificationService } from '../services/notification.service';
+import { SettingsService } from '../services/settings.service';
+import { ICustomizationSettings } from '../interfaces/ISettings';
 
 
 
@@ -15,7 +17,8 @@ import { NotificationService } from '../services/notification.service';
 export class LoginComponent implements OnInit {
 
 
-    constructor(private authService: AuthService, private router: Router, private notify: NotificationService, private status: StatusService, private fb: FormBuilder) {
+    constructor(private authService: AuthService, private router: Router, private notify: NotificationService, private status: StatusService,
+     private fb: FormBuilder, private settingsService : SettingsService) {
         this.form = this.fb.group({
             username: ["", [Validators.required]],
             password: ["", [Validators.required]]
@@ -29,9 +32,10 @@ export class LoginComponent implements OnInit {
     }
     
     form: FormGroup;
-    
-    ngOnInit(): void {
+    customizationSettings : ICustomizationSettings;
 
+    ngOnInit(): void {
+        this.settingsService.getCustomization().subscribe(x => this.customizationSettings = x);
     }
 
 
diff --git a/src/Ombi/Controllers/IdentityController.cs b/src/Ombi/Controllers/IdentityController.cs
index cec0b1515..dd913a05a 100644
--- a/src/Ombi/Controllers/IdentityController.cs
+++ b/src/Ombi/Controllers/IdentityController.cs
@@ -28,7 +28,7 @@ namespace Ombi.Controllers
             IdentityManager = identity;
             Mapper = mapper;
         }
-        
+
         private IUserIdentityManager IdentityManager { get; }
         private IMapper Mapper { get; }
 
@@ -39,7 +39,7 @@ namespace Ombi.Controllers
         [HttpGet]
         public async Task<UserViewModel> GetUser()
         {
-            return  Mapper.Map<UserViewModel>(await IdentityManager.GetUser(this.HttpContext.User.Identity.Name));
+            return Mapper.Map<UserViewModel>(await IdentityManager.GetUser(this.HttpContext.User.Identity.Name));
         }
 
 
@@ -68,7 +68,7 @@ namespace Ombi.Controllers
             {
                 Username = user.Username,
                 UserType = UserType.LocalUser,
-                Claims = new List<Claim>() {new Claim(ClaimTypes.Role, OmbiClaims.Admin)},
+                Claims = new List<Claim>() { new Claim(ClaimTypes.Role, OmbiClaims.Admin) },
                 Password = user.Password,
             });
 
@@ -108,6 +108,38 @@ namespace Ombi.Controllers
             return users;
         }
 
+        /// <summary>
+        /// Gets the user by the user id.
+        /// </summary>
+        /// <returns>Information about the user</returns>
+        [HttpGet("Users/{id}")]
+        public async Task<UserViewModel> GetUser(int id)
+        {
+            var type = typeof(OmbiClaims);
+            FieldInfo[] fieldInfos = type.GetFields(BindingFlags.Public |
+                                                    BindingFlags.Static | BindingFlags.FlattenHierarchy);
+
+            var fields = fieldInfos.Where(fi => fi.IsLiteral && !fi.IsInitOnly).ToList();
+            var allClaims = fields.Select(x => x.Name).ToList();
+            var user = Mapper.Map<UserViewModel>(await IdentityManager.GetUser(id)).ToList();
+
+
+            var userClaims = user.Claims.Select(x => x.Value);
+            IEnumerable<string> left = allClaims.Except(userClaims);
+
+            foreach (var c in left)
+            {
+                user.Claims.Add(new ClaimCheckboxes
+                {
+                    Enabled = false,
+                    Value = c
+                });
+            }
+
+
+            return user;
+        }
+
         /// <summary>
         /// Creates the user.
         /// </summary>
@@ -159,8 +191,8 @@ namespace Ombi.Controllers
             var fields = fieldInfos.Where(fi => fi.IsLiteral && !fi.IsInitOnly).ToList();
             var allClaims = fields.Select(x => x.Name).ToList();
 
-            return allClaims.Select(x => new ClaimCheckboxes() {Value = x});
+            return allClaims.Select(x => new ClaimCheckboxes() { Value = x });
         }
-        
+
     }
 }