diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php
index 0257fee3..ea0cc511 100644
--- a/ext/upgrade/main.php
+++ b/ext/upgrade/main.php
@@ -70,6 +70,22 @@ class Upgrade extends Extension {
 			$config->set_int("db_version", 6);
 			$config->set_bool("in_upgrade", false);
 		}
+
+		if($config->get_int("db_version") == -1) {
+			$database->Execute("ALTER TABLE users ADD COLUMN parent INTEGER");
+			$database->Execute("ALTER TABLE users ADD COLUMN is_template ENUM('Y','N') DEFAULT 'N'");
+			$database->Execute("INSERT INTO users(name, is_template) VALUES(?, 'Y')", array("[Anonymous]"));
+			$database->Execute("INSERT INTO users(name, is_template) VALUES(?, 'Y')", array("[User]"));
+			$database->Execute("INSERT INTO users(name, is_template) VALUES(?, 'Y')", array("[Moderator]"));
+			$database->Execute("INSERT INTO users(name, is_template) VALUES(?, 'Y')", array("[Admin]"));
+			$anon_id  = $database->db->GetOne("SELECT id FROM users WHERE name=?", array("[Anonymous]"));
+			$user_id  = $database->db->GetOne("SELECT id FROM users WHERE name=?", array("[User]"));
+			$admin_id = $database->db->GetOne("SELECT id FROM users WHERE name=?", array("[Admin]"));
+			$database->Execute("UPDATE users SET parent=?", array($user_id));
+			$database->Execute("UPDATE users SET parent=? WHERE password IS NULL", array($anon_id));
+			$database->Execute("UPDATE users SET parent=? WHERE is_admin='Y'", array($admin_id));
+			$config->set_int("db_version", 7);
+		}
 	}
 }
 add_event_listener(new Upgrade(), 5);
diff --git a/ext/upload/main.php b/ext/upload/main.php
index 725cb1c0..f5839939 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -150,6 +150,8 @@ class Upload extends Extension {
 
 			curl_setopt($ch, CURLOPT_FILE, $fp);
 			curl_setopt($ch, CURLOPT_HEADER, 0);
+			curl_setopt($ch, CURLOPT_REFERER, $url);
+			curl_setopt($ch, CURLOPT_USERAGENT, "Shimmie-".VERSION);
 
 			curl_exec($ch);
 			curl_close($ch);