diff --git a/routes/settings/instances/[instanceName].html b/routes/settings/instances/[instanceName].html
index 89227f3a..6075586a 100644
--- a/routes/settings/instances/[instanceName].html
+++ b/routes/settings/instances/[instanceName].html
@@ -28,17 +28,22 @@
       </form>
 
       <form class="instance-actions">
-        <button class="primary" disabled="{{$currentInstance === params.instanceName}}"
-          on:click="onSwitchToThisInstance()">
-          Switch to this instance
-        </button>
-        <button>Log out</button>
+        {{#if $loggedInInstancesInOrder.length > 1}}
+          <button class="primary" disabled="{{$currentInstance === params.instanceName}}"
+            on:click="onSwitchToThisInstance()">
+            {{$currentInstance === params.instanceName ? 'Current instance' : 'Switch to this instance'}}
+          </button>
+        {{/if}}
+        <button on:click="onLogOut()">Log out</button>
       </form>
     {{/if}}
   </SettingsLayout>
 </Layout>
 <style>
   .acct-current-user {
+    background: var(--form-bg);
+    border: 1px solid var(--main-border);
+    border-radius: 4px;
     padding: 20px;
     display: grid;
     align-items: center;
@@ -58,6 +63,9 @@
     grid-area: handle;
   }
   .theme-chooser {
+    background: var(--form-bg);
+    border: 1px solid var(--main-border);
+    border-radius: 4px;
     display: block;
     padding: 20px;
     line-height: 2em;
@@ -73,6 +81,7 @@
     width: 100%;
     display: flex;
     justify-content: right;
+    margin: 20px 0;
   }
   .instance-actions button {
     margin: 0 5px;
@@ -86,6 +95,8 @@
   import { getThisUserAccount } from '../../_utils/mastodon/user'
   import { themes } from '../../_static/themes'
   import { switchToTheme } from '../../_utils/themeEngine'
+  import { goto } from 'sapper/runtime.js'
+  import { toast } from '../../_utils/toast'
 
   export default {
     components: {
@@ -127,6 +138,29 @@
         })
         this.store.save()
         switchToTheme(instanceThemes[instanceName])
+      },
+      onLogOut() {
+        let loggedInInstances = this.store.get('loggedInInstances')
+        let instanceThemes = this.store.get('instanceThemes')
+        let loggedInInstancesInOrder = this.store.get('loggedInInstancesInOrder')
+        let instanceName = this.get('params').instanceName
+        let currentInstance = this.store.get('currentInstance')
+        loggedInInstancesInOrder.splice(loggedInInstancesInOrder.indexOf(instanceName), 1)
+        let newInstance = instanceName === currentInstance ?
+          loggedInInstancesInOrder[0] :
+          currentInstance
+        delete loggedInInstances[instanceName]
+        delete instanceThemes[instanceName]
+        this.store.set({
+          loggedInInstances: loggedInInstances,
+          instanceThemes: instanceThemes,
+          loggedInInstancesInOrder: loggedInInstancesInOrder,
+          currentInstance: newInstance
+        })
+        this.store.save()
+        switchToTheme(instanceThemes[newInstance] || 'default')
+        toast.say(`Logged out of ${instanceName}`)
+        goto('/settings/instances')
       }
     }
   }
diff --git a/routes/settings/instances/add.html b/routes/settings/instances/add.html
index e082a10a..0d8f93cb 100644
--- a/routes/settings/instances/add.html
+++ b/routes/settings/instances/add.html
@@ -41,6 +41,7 @@
     padding: 5px 10px 15px;
     margin: 20px auto;
     border: 1px solid var(--form-border);
+    border-radius: 4px;
   }
 
   form.add-new-instance label, form.add-new-instance input, form.add-new-instance button {
diff --git a/routes/settings/instances/index.html b/routes/settings/instances/index.html
index ad0add1a..746d76a7 100644
--- a/routes/settings/instances/index.html
+++ b/routes/settings/instances/index.html
@@ -7,7 +7,7 @@
     <h1>Instances</h1>
 
     {{#if $isUserLoggedIn}}
-    <p>Instances you've connected to:</p>
+    <p>Instances you've logged in to:</p>
     <SettingsList>
       {{#each $loggedInInstancesAsList as instance}}
         <SettingsListItem offsetForIcon="{{instance.name !== $currentInstance}}"
@@ -18,7 +18,8 @@
     </SettingsList>
     <p><a href="/settings/instances/add">Add another instance</a></p>
     {{else}}
-    <p><a href="/settings/instances/add">Connect to an instance</a> to start using Pinafore.</p>
+    <p>You're not logged in to any instances.</p>
+    <p><a href="/settings/instances/add">Log in to an instance</a> to start using Pinafore.</p>
     {{/if}}
   </SettingsLayout>
 </Layout>