diff --git a/GroomWise.Application/ViewModels/CustomerViewModel.cs b/GroomWise.Application/ViewModels/CustomerViewModel.cs
index 26f1a83..5eca187 100644
--- a/GroomWise.Application/ViewModels/CustomerViewModel.cs
+++ b/GroomWise.Application/ViewModels/CustomerViewModel.cs
@@ -48,7 +48,8 @@ await Task.Run(() =>
         {
             var customers = GroomWiseDbContext!.Customers
                 .GetAll()
-                .Select(CustomerMapper.ToObservable);
+                .Select(CustomerMapper.ToObservable)
+                .OrderBy(customer => customer.FullName);
             Customers = new ConcurrentObservableCollection<ObservableCustomer>(customers);
         });
     }
diff --git a/GroomWise.WPF/Views/Dialogs/AddCustomersView.xaml b/GroomWise.WPF/Views/Dialogs/AddCustomersView.xaml
index 453ab93..3fd476f 100644
--- a/GroomWise.WPF/Views/Dialogs/AddCustomersView.xaml
+++ b/GroomWise.WPF/Views/Dialogs/AddCustomersView.xaml
@@ -12,6 +12,7 @@
     Width="600"
     d:DataContext="{d:DesignInstance viewModels:CustomerViewModel,
                                      IsDesignTimeCreatable=True}"
+    FocusManager.FocusedElement="{Binding ElementName=FullNameTextBox}"
     NoDecorations="True"
     ResizeMode="NoResize"
     SizeToContent="Height"
@@ -37,6 +38,7 @@
             VerticalAlignment="Top">
             <Grid>
                 <russkyc:ModernTextBox
+                    Name="FullNameTextBox"
                     Margin="0,0,0,0"
                     CornerRadius="5"
                     HelperText="Max Length (200)"
diff --git a/GroomWise.WPF/Views/Dialogs/LoginView.xaml b/GroomWise.WPF/Views/Dialogs/LoginView.xaml
index 5962acb..7c1f342 100644
--- a/GroomWise.WPF/Views/Dialogs/LoginView.xaml
+++ b/GroomWise.WPF/Views/Dialogs/LoginView.xaml
@@ -2,6 +2,7 @@
     x:Class="GroomWise.Views.Dialogs.LoginView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:icons="clr-namespace:Material.Icons.WPF;assembly=Material.Icons.WPF"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -14,6 +15,7 @@
     d:DataContext="{d:DesignInstance viewModels:LoginViewModel,
                                      IsDesignTimeCreatable=True}"
     ExtendClientAreaToChrome="True"
+    FocusManager.FocusedElement="{Binding ElementName=UsernameBox}"
     HideDefaultWindowTitle="True"
     ResizeMode="NoResize"
     TitleBarBackground="Transparent"
diff --git a/GroomWise.WPF/Views/Dialogs/LoginView.xaml.cs b/GroomWise.WPF/Views/Dialogs/LoginView.xaml.cs
index c413014..fcf3a8a 100644
--- a/GroomWise.WPF/Views/Dialogs/LoginView.xaml.cs
+++ b/GroomWise.WPF/Views/Dialogs/LoginView.xaml.cs
@@ -4,13 +4,10 @@
 // without written, signed consent from the author is strictly prohibited.
 
 using System;
-using System.Linq;
 using System.Windows.Input;
 using GroomWise.Application.ViewModels;
 using GroomWise.Infrastructure.Navigation.Interfaces;
 using Injectio.Attributes;
-using Russkyc.DependencyInjection.Attributes;
-using Russkyc.DependencyInjection.Enums;
 
 namespace GroomWise.Views.Dialogs;
 
@@ -22,22 +19,13 @@ public LoginView(LoginViewModel vm)
         DataContext = vm;
         InitializeComponent();
         ClearFields();
+        UsernameBox.Focus();
     }
 
     public void ClearFields()
     {
         UsernameBox.Clear();
         PasswordBox.Clear();
-        UsernameBox.Focus();
-    }
-
-    public void ClearFields(params string[] fields)
-    {
-        if (fields.Any(field => UsernameBox.Name.Contains(field)))
-            UsernameBox.Clear();
-        if (fields.Any(field => PasswordBox.Name.Contains(field)))
-            PasswordBox.Clear();
-        UsernameBox.Focus();
     }
 
     protected override void OnClosed(EventArgs e)