diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java
index b2211b1..c732d80 100644
--- a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java
+++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java
@@ -49,10 +49,8 @@ public class LoginFragment extends Fragment {
 
 
     private void subscribe(LoginViewModel viewModel) {
-        viewModel.errorLiveData.observe(getViewLifecycleOwner(), error -> {
-            binding.error.setVisibility(Utils.visibleOrGone(error != null));
-            binding.error.setText(error);
-        });
+        viewModel.errorLiveData.observe(getViewLifecycleOwner(), error ->
+                binding.error.setVisibility(Utils.visibleOrGone(error != null)));
         viewModel.stateLiveData.observe(getViewLifecycleOwner(), state -> {
             binding.login.setClickable(state.isButtonActive());
             if (state.isButtonActive()) {
diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/UserFragment.java b/app/src/main/java/ru/myitschool/work/ui/profile/UserFragment.java
index d2f8146..86df7ce 100644
--- a/app/src/main/java/ru/myitschool/work/ui/profile/UserFragment.java
+++ b/app/src/main/java/ru/myitschool/work/ui/profile/UserFragment.java
@@ -3,7 +3,6 @@ package ru.myitschool.work.ui.profile;
 import static ru.myitschool.work.ui.qr.result.QrResultFragment.RESPONSE_KEY;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -40,15 +39,13 @@ public class UserFragment extends Fragment {
         viewModel = new ViewModelProvider(this).get(UserViewModel.class);
         viewModel.stateLiveData.observe(getViewLifecycleOwner(), state -> {
             UserEntity entity = state.getItem();
-            if (entity == null) {
-                return;
-            } else if (state.getErrorMessage() != null) {
+            if (state.getErrorMessage() != null) {
                 binding.error.setVisibility(View.VISIBLE);
                 binding.error.setText(state.getErrorMessage());
 
                 binding.logout.setVisibility(View.GONE);
                 binding.scan.setVisibility(View.GONE);
-            } else {
+            } else if (entity != null) {
                 binding.photo.setVisibility(Utils.visibleOrGone(entity.getPhotoUrl() != null));
                 binding.position.setVisibility(Utils.visibleOrGone(entity.getPosition() != null));
                 binding.lastEntry.setVisibility(Utils.visibleOrGone(entity.getLast_visit() != null));
@@ -66,7 +63,6 @@ public class UserFragment extends Fragment {
         });
 
         if (getContext() != null && Utils.getLogin(getContext()) != null) {
-            Log.d("login", Utils.getLogin(getContext()));
             viewModel.update(Utils.getLogin(getContext()));
         }
 
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 0f0d678..3435f70 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/white">
 
     <LinearLayout
@@ -23,8 +22,9 @@
             android:textSize="24sp" />
 
         <EditText
+            android:inputType="textEmailAddress"
             android:layout_marginTop="24dp"
-            android:paddingStart="20dp"
+            android:paddingHorizontal="20dp"
             android:fontFamily="@font/manrope_light"
             android:id="@+id/username"
             android:layout_width="match_parent"
@@ -50,7 +50,8 @@
             android:textColor="@color/warn_button_color"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:text="Some error"/>
+            android:visibility="gone"
+            android:text="@string/error"/>
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file