diff --git a/ext/index/main.php b/ext/index/main.php
index d781cb4e..7d96f2e5 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -83,9 +83,9 @@ class Index implements Extension {
 			$count = $config->get_int('index_width') * $config->get_int('index_height');
 			$images = Image::find_images($config, $database, ($page_number-1)*$count, $count, $search_terms);
 
-			if(!(count($search_terms) == 0 && count($images) == 0)) {
-				send_event(new PostListBuildingEvent($event->page, $search_terms));
+			send_event(new PostListBuildingEvent($event->page, $search_terms));
 
+			if(!(count($search_terms) == 0 && count($images) == 0)) {
 				$this->theme->set_page($page_number, $total_pages, $search_terms);
 				$this->theme->display_page($event->page, $images);
 			}
diff --git a/ext/index/theme.php b/ext/index/theme.php
index 4f596083..b84a52b3 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -16,6 +16,8 @@ administrator, and any further accounts will be regular users.
 
 <p>Once logged in you can play with the settings, install extra features,
 and of course start organising your images :-)
+
+<p>This message will go away once your first image is uploaded~
 </div>
 EOD;
 		$page->set_title("Welcome to Shimmie ".VERSION);
diff --git a/ext/user/main.php b/ext/user/main.php
index 9da15ff3..7b15e61c 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -161,7 +161,8 @@ class UserPage implements Extension {
 		}
 
 		if($event instanceof UserCreationEvent) {
-			if($this->check_user_creation($event)) $this->create_user($event);
+			$this->check_user_creation($event);
+			$this->create_user($event);
 		}
 
 		if($event instanceof SearchTermParseEvent) {