diff --git a/mod/directory.php b/mod/directory.php
index b0cee76cb7..82f2b79b33 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -14,6 +14,8 @@ function directory_post(&$a) {
 function directory_content(&$a) {
 	$o = '';
 	$o .= '<script>	$(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
+	if(x($_SESSION,'theme'))
+		unset($_SESSION['theme']);
 
 	if(x($a->data,'search'))
 		$search = notags(trim($a->data['search']));
diff --git a/mod/home.php b/mod/home.php
index 2d646f8dd8..d45b13ed5f 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -14,11 +14,10 @@ if(! function_exists('home_content')) {
 function home_content(&$a) {
 
 	$o = '';
-/*
- *	if(! (x($a->page,'footer')))
- *		$a->page['footer'] = '';
- *	$a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" title=\"friendika\" >friendika</a></div>";
- */
+
+	if(x($_SESSION,'theme'))
+		unset($_SESSION['theme']);
+
 	$o .= '<h1>' . ((x($a->config,'sitename')) ? t("Welcome to ").$a->config['sitename'] : "" ) . '</h1>';
 	if(file_exists('home.html'))
  		$o .= file_get_contents('home.html');
diff --git a/mod/login.php b/mod/login.php
index 6ee625966d..58af42d744 100644
--- a/mod/login.php
+++ b/mod/login.php
@@ -1,5 +1,8 @@
 <?php
 
 function login_content(&$a) {
+	if(x($_SESSION,'theme'))
+		unset($_SESSION['theme']);
 	return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
+
 }
\ No newline at end of file
diff --git a/mod/register.php b/mod/register.php
index fcc9ebcab5..86bfe2066e 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -360,6 +360,10 @@ function register_content(&$a) {
 		return;
 	}
 
+	if(x($_SESSION,'theme'))
+		unset($_SESSION['theme']);
+
+
 	$username     = ((x($_POST,'username'))     ? $_POST['username']     : ((x($_GET,'username'))     ? $_GET['username']              : ''));
 	$email        = ((x($_POST,'email'))        ? $_POST['email']        : ((x($_GET,'email'))        ? $_GET['email']                 : ''));
 	$openid_url   = ((x($_POST,'openid_url'))   ? $_POST['openid_url']   : ((x($_GET,'openid_url'))   ? $_GET['openid_url']            : ''));
diff --git a/mod/search.php b/mod/search.php
index 7605e9ae26..20113e75bc 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -9,6 +9,9 @@ function search_post(&$a) {
 
 function search_content(&$a) {
 
+	if(x($_SESSION,'theme'))
+		unset($_SESSION['theme']);
+
 	$o = '<div id="live-search"></div>' . "\r\n";
 
 	$o .= '<h3>' . t('Search') . '</h3>';