diff --git a/ext/alias_editor/main.php b/ext/alias_editor/main.php
index 4ef4e565..0173ff05 100644
--- a/ext/alias_editor/main.php
+++ b/ext/alias_editor/main.php
@@ -138,7 +138,12 @@ class AliasEditor extends Extension {
 		foreach(explode("\n", $csv) as $line) {
 			$parts = explode(",", $line);
 			if(count($parts) == 2) {
-				$database->execute("INSERT INTO aliases(oldtag, newtag) VALUES(:oldtag, :newtag)", array("oldtag" => $parts[0], "newtag" => $parts[1]));
+				$pair = array("oldtag" => $parts[0], "newtag" => $parts[1]);
+				if(!$database->get_row("SELECT * FROM aliases WHERE oldtag=:oldtag AND lower(newtag)=lower(:newtag)", $pair)){
+					if(!$database->get_row("SELECT * FROM aliases WHERE oldtag=:newtag", array("newtag" => $pair['newtag']))){
+						$database->execute("INSERT INTO aliases(oldtag, newtag) VALUES(:oldtag, :newtag)", $pair);
+					}
+				}
 			}
 		}
 	}
diff --git a/ext/alias_editor/theme.php b/ext/alias_editor/theme.php
index 34e66d8d..b8b2f9a7 100644
--- a/ext/alias_editor/theme.php
+++ b/ext/alias_editor/theme.php
@@ -57,7 +57,7 @@ class AliasEditorTheme extends Themelet {
 		";
 
 		$bulk_html = "
-			".make_form(make_link("alias/import"), $multipart=True)."
+			".make_form(make_link("alias/import"), 'post', true)."
 				<input type='file' name='alias_file'>
 				<input type='submit' value='Upload List'>
 			</form>