diff --git a/core/templates/SideBar.tid b/core/templates/SideBar.tid
index a9afaf8836..34a97add19 100644
--- a/core/templates/SideBar.tid
+++ b/core/templates/SideBar.tid
@@ -31,6 +31,7 @@ title: $:/templates/SideBar
 </$reveal>
 <$reveal type="match" state="$:/state/sideBarTabSet" text="toolsTab" qualifyTiddlerTitles="yes">
 {{$:/templates/ControlPanel}}
+{{$:/templates/ServerControlPanel}}
 </$reveal>
 <$reveal type="match" state="$:/state/sideBarTabSet" text="moreTab" qualifyTiddlerTitles="yes">
 {{$:/templates/MoreSideBar}}
diff --git a/editions/clientserver/tiddlers/TiddlyWiki5 Personal Client Server Edition.tid b/editions/clientserver/tiddlers/TiddlyWiki5 Personal Client Server Edition.tid
index 7642457056..8beb99ac9b 100644
--- a/editions/clientserver/tiddlers/TiddlyWiki5 Personal Client Server Edition.tid	
+++ b/editions/clientserver/tiddlers/TiddlyWiki5 Personal Client Server Edition.tid	
@@ -1,20 +1,4 @@
 title: TiddlyWiki5 Personal Client Server Edition
+modified: 201304152100
 
 Experimental clientserver edition of TiddlyWiki5.
-
-----
-
-Current [[login status|$:/status/IsLoggedIn]]: {{$:/status/IsLoggedIn}}
-
-Current [[username|$:/status/UserName]]: {{$:/status/UserName}}
-
-----
-
-<$reveal state="$:/status/IsLoggedIn" type="nomatch" text="yes">
-Log in to ~TiddlyWeb: <$button message="tw-login" class="btn btn-info">Login</$button>
-</$reveal>
-<$reveal state="$:/status/IsLoggedIn" type="match" text="yes">
-Log out of ~TiddlyWeb: <$button message="tw-logout" class="btn btn-warning">Logout</$button>
-</$reveal>
-
-<$button message="tw-server-refresh" class="btn btn-warning">Refresh</$button> to fetch changes from the server immediately
diff --git a/plugins/tiddlywiki/tiddlyweb/ServerControlPanel.tid b/plugins/tiddlywiki/tiddlyweb/ServerControlPanel.tid
new file mode 100644
index 0000000000..3c9834e71b
--- /dev/null
+++ b/plugins/tiddlywiki/tiddlyweb/ServerControlPanel.tid
@@ -0,0 +1,12 @@
+title: $:/templates/ServerControlPanel
+
+----
+
+<$reveal state="$:/status/IsLoggedIn" type="nomatch" text="yes">
+Log in to ~TiddlyWeb: <$button message="tw-login" class="btn btn-info">Login</$button>
+</$reveal>
+<$reveal state="$:/status/IsLoggedIn" type="match" text="yes">
+Log out of ~TiddlyWeb: <$button message="tw-logout" class="btn btn-warning">Logout</$button>
+</$reveal>
+
+<$button message="tw-server-refresh" class="btn btn-warning">Refresh</$button> to fetch changes from the server immediately