diff --git a/apps/users/api/user.py b/apps/users/api/user.py
index 2a033915c..4545f629b 100644
--- a/apps/users/api/user.py
+++ b/apps/users/api/user.py
@@ -119,7 +119,7 @@ class UserResetPKApi(UserQuerysetMixin, generics.UpdateAPIView):
     def perform_update(self, serializer):
         from ..utils import send_reset_ssh_key_mail
         user = self.get_object()
-        user.is_public_key_valid = False
+        user.public_key = None
         user.save()
         send_reset_ssh_key_mail(user)
 
diff --git a/apps/users/views/login.py b/apps/users/views/login.py
index 046bc9415..3f0f88e8f 100644
--- a/apps/users/views/login.py
+++ b/apps/users/views/login.py
@@ -142,7 +142,6 @@ class UserFirstLoginView(PermissionsMixin, SessionWizardView):
                 if field.value():
                     setattr(user, field.name, field.value())
         user.is_first_login = False
-        user.is_public_key_valid = True
         user.save()
         context = {
             'user_guide_url': settings.USER_GUIDE_URL