diff --git a/TIAMSharedUI/Pages/Login.razor b/TIAMSharedUI/Pages/Login.razor
index b1097ff6..77b5c283 100644
--- a/TIAMSharedUI/Pages/Login.razor
+++ b/TIAMSharedUI/Pages/Login.razor
@@ -30,12 +30,12 @@
                             @switch (currentStep)
                             {
                                 case 1:
-                                    <LoginStep1 @bind-LoginModel="loginModel" onLoginNext="GoToNextStep" />
+                                    <LoginStep1 @bind-LoginModel="_loginModel" onLoginNext="GoToNextStep" />
                                     ;
                                     break;
 
                                 case 2:
-                                    <LoginStep3 @bind-LoginModel="loginModel" onSubmit="SubmitLogin" onPrev="GoToPreviousStep" />
+                                    <LoginStep3 @bind-LoginModel="_loginModel" onSubmit="SubmitLogin" onPrev="GoToPreviousStep" />
                                     ;
                                     break;
                             }
@@ -50,9 +50,9 @@
 
                             <div>
 
-                                <p>@localizer["LoginEmail"]: @loginModel.Email</p>
+                                <p>@localizer["LoginEmail"]: @_loginModel.Email</p>
 
-                                <p>@loginModel.Password</p>
+                                <p>@_loginModel.Password</p>
                             </div>
                         }
                     }
@@ -76,7 +76,7 @@
 </div>
 
 @code {
-    LoginModel loginModel = new LoginModel("test@tiam.hu", "test1234");
+    LoginModel _loginModel = new LoginModel("test@tiam.hu", "test1234");
 
 
 }
\ No newline at end of file
diff --git a/TIAMSharedUI/Pages/Login.razor.cs b/TIAMSharedUI/Pages/Login.razor.cs
index d419d631..12f20298 100644
--- a/TIAMSharedUI/Pages/Login.razor.cs
+++ b/TIAMSharedUI/Pages/Login.razor.cs
@@ -60,8 +60,8 @@ namespace TIAMSharedUI.Pages
         private async void SubmitLogin()
         {
             currentStep = 1;
-            BrowserConsoleLogWriter.Info("Login started: " + "Email: " + loginModel.Email + ", Password: " + loginModel.Password);
-            var response = await userDataService.AuthenticateUser(loginModel);
+            BrowserConsoleLogWriter.Info("Login started: " + "Email: " + _loginModel.Email + ", Password: " + _loginModel.Password);
+            var response = await userDataService.AuthenticateUser(_loginModel);
             //var response = await UserDataservice.TestUserApi(30);
             BrowserConsoleLogWriter.Info("Login started");
             BrowserConsoleLogWriter.Info(response);
diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor
index d1516a21..8c9cb06b 100644
--- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor
@@ -41,7 +41,7 @@
                         <CompanyGrid @ref="_gridCompany"
                                      Logger="_logger"
                                      SignalRClient="AdminSignalRClient"
-                                     ContextIds="contextIds.Cast<object>().ToArray()"
+                                     ContextIds="_contextIds.Cast<object>().ToArray()"
                                      GetAllMessageTag="SignalRTags.GetCompaniesByContextId"
                                      PageSize="12"
                                      ValidationEnabled="false"
@@ -81,16 +81,16 @@
 
 
 @code {
-    private LoggerClient<MyServiceProviders> _logger;
+    private LoggerClient<MyServiceProviders> _logger = null!;
 
-    private CompanyGrid _gridCompany;
+    private CompanyGrid _gridCompany = null!;
 
-    public ServiceProviderWizardModel myModel = new ServiceProviderWizardModel();
+    public ServiceProviderWizardModel MyModel = new ServiceProviderWizardModel();
 
     bool EulaAccepted { get; set; }
     bool EulaVisible { get; set; }
 
-    private Guid[] contextIds = new Guid[0];
+    private Guid[] _contextIds = new Guid[0];
 
     void CancelCreateClick()
     {
@@ -103,16 +103,16 @@
     }
     void EulaPopupClosing(PopupClosingEventArgs args)
     {
-        myModel = new ServiceProviderWizardModel();
+        MyModel = new ServiceProviderWizardModel();
     }
 
     //-----------------------------------------------------------------------------------
 
 
-    public async Task SubmitForm(object Result)
+    public async Task SubmitForm(object result)
     {
         //await WizardProcessor.ProcessWizardAsync(Result.GetType(), Result);
-        _logger.Info($"Submitted nested form: {Result.GetType().FullName}");
+        _logger.Info($"Submitted nested form: {result.GetType().FullName}");
     }
 
 
@@ -131,9 +131,9 @@
     {
         _logger = new LoggerClient<MyServiceProviders>(LogWriters.ToArray());
 
-        var myId = SessionService.User.UserId;
-        contextIds = new Guid[1];
-        contextIds[0] = myId;
+        var myId = SessionService.User!.UserId;
+        _contextIds = new Guid[1];
+        _contextIds[0] = myId;
         // ServiceProviderDataService.GetPropertiesByOwnerIdAsync(myId, companyPropertiesByOwner =>
         // {
         //     _logger.DetailConditional($"companyPropertiesByOwner count: {companyPropertiesByOwner?.Count.ToString() ?? "NULL"}");