diff --git a/index.php b/index.php
index 9d1f963..ab395e9 100644
--- a/index.php
+++ b/index.php
@@ -98,7 +98,7 @@ if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint.js")) {
 	<div class="plugins" id="pluginsContainer">
 	<?php echo $pluginsDisplay; ?>
 	</div>
-	<div class="version">v <?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
+	<div class="version"><a href="javascript:top:ICEcoder.logout()">logout</a> : v <?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
 	<img src="images/ice-coder.png" class="logo" onClick="ICEcoder.helpScreen()" onContextMenu="ICEcoder.settingsScreen()">
 </div>
 
diff --git a/lib/ice-coder.css b/lib/ice-coder.css
index 0d354bd..9306f2b 100644
--- a/lib/ice-coder.css
+++ b/lib/ice-coder.css
@@ -70,6 +70,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .header .plugins img {position: relative; display: inline-block; margin-right: 15px}
 .header .screenModeIcon {position: absolute; top: 5px; right: 178px; cursor: pointer}
 .header .version {position: relative; display: inline-block; margin-top: 25px; font-size: 10px; color: #bbb}
+.header .version a {font-size: 10px; color: #bbb; text-decoration: none}
 .header .logo {position: relative; margin: 5px 10px 0 5px; cursor: pointer}
 
 .files {position: absolute; display: inline-block; top: 0; left: 0; height: 100%; width: 250px; background-color: #444; background-image: url('../images/files-arrow.png'); background-repeat: no-repeat; background-position: 100% 50%; overflow: hidden; z-index: 1;
diff --git a/lib/ice-coder.js b/lib/ice-coder.js
index 378b608..93886a5 100644
--- a/lib/ice-coder.js
+++ b/lib/ice-coder.js
@@ -1479,6 +1479,11 @@ var ICEcoder = {
 		top.ICEcoder.serverMessage('<b>chMod '+perms+' on </b><br>'+file.replace(top.iceRoot,""));
 	},
 
+	// Logout of ICEcoder
+	logout: function() {
+		window.location = window.location + "?logout";
+	},
+
 	// Show a message
 	message: function(msg) {
 		alert(msg);
diff --git a/lib/settings.php b/lib/settings.php
index ca6ca34..2cac847 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -11,6 +11,13 @@ error_reporting(-1);
 // Start a session if we haven't already
 if(!isset($_SESSION)) {session_start();}
 
+// Logout if that's the action we're taking
+if (isset($_GET['logout'])) {
+	$_SESSION['loggedIn']=false;
+	session_destroy();
+	header("Location: dirname(__FILE__)./?loggedOut");
+}
+
 // Function to handle salted hashing
 define('SALT_LENGTH',9);
 function generateHash($plainText,$salt=null) {
@@ -262,7 +269,7 @@ echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login";
 		<div class="version">v <?php echo $ICEcoder["versionNo"];?></div>
 		<form name="settingsUpdate" action="settings.php" method="POST">
 		<input type="password" name="<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password" class="accountPassword"><br><br>
-		<input type="submit" name="submit" value="<?php echo $ICEcoder["accountPassword"] == "" ? "Set Password" : "Login"; ?>" class="button">
+		<input type="submit" name="submit" value="<?php echo $ICEcoder["accountPassword"] == "" ? "set password" : "login"; ?>" class="button">
 		</form>
 		</div>
 	</div>