1 files changed, 3 insertions, 3 deletions
diff --git a/Juick/ViewModels/LoginViewModel.cs b/Juick/ViewModels/LoginViewModel.cs
index c0bf1f9..95528fe 100644
--- a/Juick/ViewModels/LoginViewModel.cs
+++ b/Juick/ViewModels/LoginViewModel.cs
@@ -2,11 +2,12 @@
 using System.Net;
 using System.Windows;
 using Juick.Classes;
+using Juick.ViewModels.Validation;
 using RestSharp;
 
 namespace Juick.ViewModels
 {
-    public class LoginViewModel : ViewModelBase 
+    public class LoginViewModel : DataViewModelBase 
     {
         private string _username;
         private string _password;
@@ -59,12 +60,11 @@ namespace Juick.ViewModels
                                                                                      App.AppContext.Account.UserName = Username;
                                                                                      App.AppContext.Account.Password = Password;
                                                                                      App.AppContext.Account.IsAuthenticated = true;
-                                                                                     App.AppContext.EnableNotifications();
                                                                                      ((App)Application.Current).NavigateTo(NextUri, true);
                                                                                  }
                                                                                  else
                                                                                  {
-                                                                                     MessageBox.Show("Invalid username or password", "Error", MessageBoxButton.OK);
+                                                                                     AddError("Username", "Invalid username or password", false);
                                                                                  }
                                                                              });
         }