diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index c6be61fd24d853cf72d7599373df96e1d89f42e3..e2b6445ad8b4c5a5f47f78af3a80e06274c0c6ad 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -1350,8 +1350,13 @@ class BlenderKitAddonPreferences(AddonPreferences):
                 op = layout.operator("wm.url_open", text="Register online and get your API Key",
                                      icon='QUESTION')
                 op.url = paths.BLENDERKIT_SIGNUP_URL
+        else:
+            if self.enable_oauth:
+                layout.operator("wm.blenderkit_logout", text="Logout",
+                                icon='URL')
 
-        layout.prop(self, "api_key", text='Your API Key')
+        if not self.enable_oauth:
+            layout.prop(self, "api_key", text='Your API Key')
         # layout.label(text='After you paste API Key, categories are downloaded, so blender will freeze for a few seconds.')
         layout.prop(self, "global_dir")
         layout.prop(self, "project_subdir")
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index 37b84aeb015cf21ba87be8fd247018f6b2f93ed6..480d1afe9fff73f2a262fa2de8ebeeeadd7bbc8e 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -425,9 +425,6 @@ class VIEW3D_PT_blenderkit_profile(Panel):
                     layout.label(text='Remaining private storage: %i MiB' % (me['remainingPrivateQuota']))
             layout.operator("wm.url_open", text="See my uploads",
                             icon='URL').url = paths.BLENDERKIT_USER_ASSETS
-            if user_preferences.enable_oauth:
-                layout.operator("wm.blenderkit_logout", text="Logout",
-                                icon='URL')
 
 
 def draw_panel_model_rating(self, context):