diff --git a/core/ui/ControlPanel/Encryption.tid b/core/ui/ControlPanel/Encryption.tid
deleted file mode 100644
index 178647e9e..000000000
--- a/core/ui/ControlPanel/Encryption.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: $:/core/ui/ControlPanel/Encryption
-tags: $:/tags/ControlPanel
-caption: Encryption
-
-{{$:/snippets/encryptionstatus}}
\ No newline at end of file
diff --git a/core/ui/ControlPanel/Saving.tid b/core/ui/ControlPanel/Saving.tid
new file mode 100644
index 000000000..287c9de37
--- /dev/null
+++ b/core/ui/ControlPanel/Saving.tid
@@ -0,0 +1,11 @@
+title: $:/core/ui/ControlPanel/Saving
+tags: $:/tags/ControlPanel
+caption: Saving
+
+! TiddlySpot
+
+|[[Wiki name|$:/UploadName]] |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |
+|Password |<$password name="upload"/> |
+|Server URL |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> |
+
+//The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address//
diff --git a/core/ui/ControlPanel/Tools.tid b/core/ui/ControlPanel/Tools.tid
index cdbe84f04..1fd1f2c6d 100644
--- a/core/ui/ControlPanel/Tools.tid
+++ b/core/ui/ControlPanel/Tools.tid
@@ -7,3 +7,7 @@ caption: Tools
 <$browse/>
 
 Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). You can also drag and drop files directly to the browser window.
+
+! Encryption
+
+{{$:/snippets/encryptionstatus}}
diff --git a/core/wiki/tags/ControlPanel.tid b/core/wiki/tags/ControlPanel.tid
index e9cae24ce..7d6989e01 100644
--- a/core/wiki/tags/ControlPanel.tid
+++ b/core/wiki/tags/ControlPanel.tid
@@ -1,2 +1,2 @@
 title: $:/tags/ControlPanel
-list: $:/core/ui/ControlPanel/Basics $:/core/ui/ControlPanel/Appearance $:/core/ui/ControlPanel/Encryption $:/core/ui/ControlPanel/Plugins $:/core/ui/ControlPanel/Tools $:/core/ui/ControlPanel/Internals
+list: $:/core/ui/ControlPanel/Basics $:/core/ui/ControlPanel/Appearance $:/core/ui/ControlPanel/Saving $:/core/ui/ControlPanel/Plugins $:/core/ui/ControlPanel/Tools $:/core/ui/ControlPanel/Internals
diff --git a/editions/tw5.com/tiddlers/TiddlySpot.tid b/editions/tw5.com/tiddlers/TiddlySpot.tid
index c0e2127ba..970b1f21c 100644
--- a/editions/tw5.com/tiddlers/TiddlySpot.tid
+++ b/editions/tw5.com/tiddlers/TiddlySpot.tid
@@ -10,22 +10,8 @@ TiddlySpot is a free hosting service for TiddlyWiki documents from Simon and Dan
 TiddlyWiki5 isn't yet built in to TiddlySpot but you can use it by following these steps:
 
 # Sign up for a new wiki at http://tiddlyspot.com/, and remember the wiki name and password
-# Open TiddlyWiki5 in your browser from http://five.tiddlywiki.com/
-# Fill in the information listed below
+# Open TiddlyWiki5 in your browser from http://five.tiddlywiki.com/empty.html
+# Fill in the TiddlySpot wikiname and password in the control panel
 # Click the "Save Changes" button. You should get a confirmation message `0 - Fileindex.html`
 # Navigate to your TiddlySpot URL at http://{wikiname}.tiddlyspot.com/
 # You should see a copy of TiddlyWiki5. You can edit and create tiddlers, and click "Save Changes" to save changes back up to TiddlySpot (you'll need to re-enter your password the first time you visit the wiki on TiddlySpot)
-
-! TiddlySpot details
-
-Wiki name: <$edit-text tiddler="$:/UploadName" default="" tag="input"/>
-
-Password: <$password name="upload"/>
-
-----
-
-If you're using a server other than TiddlySpot, you can set the server URL here:
-
-Service URL: <$edit-text tiddler="$:/UploadURL" default="" tag="input"/>
-
-//(by default, the server URL is `http://<wikiname>.tiddlyspot.com/store.cgi`)//