diff --git a/src/classes/Models/Server.php b/src/classes/Models/Server.php
index 72c89e0..9f1ec5c 100644
--- a/src/classes/Models/Server.php
+++ b/src/classes/Models/Server.php
@@ -33,7 +33,9 @@ class Server extends \Friendica\Directory\Model
 			SET `server_id` = :server_id,
 				`alias` = :alias,
 				`timestamp` = NOW()
-			ON DUPLICATE KEY UPDATE `timestamp` = NOW()',
+			ON DUPLICATE KEY UPDATE 
+				`server_id` = :server_id,
+				`timestamp` = NOW()',
 			[
 				'server_id' => $server_id,
 				'alias' => strtolower($server_alias)
diff --git a/src/sql/migrations/down/0006.sql b/src/sql/migrations/down/0006.sql
new file mode 100644
index 0000000..e69de29
diff --git a/src/sql/migrations/up/0007.sql b/src/sql/migrations/up/0007.sql
new file mode 100644
index 0000000..1c85712
--- /dev/null
+++ b/src/sql/migrations/up/0007.sql
@@ -0,0 +1,6 @@
+BEGIN;
+CREATE TABLE temp_server_alias AS SELECT * FROM server_alias GROUP BY alias;
+DROP TABLE server_alias;
+RENAME TABLE temp_server_alias TO server_alias;
+CREATE UNIQUE INDEX server_alias_alias_uindex ON server_alias (alias);
+COMMIT;