diff --git a/network.sh b/network.sh
deleted file mode 100755
index f6153a99..00000000
--- a/network.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-set -e
-
-launch_kv() {
-	bash -c "exec -a kv ./target/debug/kv-test-util $1"
-}
-
-kill_kv() {
-	kill -9 $(pidof kv)
-}
-
-help() {
-	cat << EOF
-USAGE:
-  ./network.sh
-  launch		 launches key-value server
-  kill			 kills key-value server
-EOF
-}
-
-if [ -z $1 ]
-then
-    help
-elif [ $1 == 'launch' ]
-then 
-	if [ -z $2 ]
-	then
-		help
-	else
-		launch_kv $2
-	fi
-elif [ $1 == 'kill' ]
-then
-		kill_kv
-else
-	help
-fi
diff --git a/src/api/v1/mcaptcha/mcaptcha.rs b/src/api/v1/mcaptcha/mcaptcha.rs
index 4a91d16b..b0a6b402 100644
--- a/src/api/v1/mcaptcha/mcaptcha.rs
+++ b/src/api/v1/mcaptcha/mcaptcha.rs
@@ -78,20 +78,28 @@ pub async fn update_token(
     data: web::Data<Data>,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
+    use std::borrow::Cow;
+
     is_authenticated(&id)?;
-    let key = get_random(32);
     let url = Url::parse(&payload.domain)?;
+    let mut key;
 
     let host = url.host_str().ok_or(ServiceError::NotAUrl)?;
-    sqlx::query!(
-        "UPDATE mcaptcha_config SET key = $1 
-        WHERE name = $2 AND domain_name = $3",
-        &key,
-        &payload.name,
-        &host,
-    )
-    .execute(&data.db)
-    .await?;
+    loop {
+        key = get_random(32);
+        let res = update_token_helper(&key, &payload.name, &host, &data).await;
+        if res.is_ok() {
+            break;
+        } else {
+            if let Err(sqlx::Error::Database(err)) = res {
+                if err.code() == Some(Cow::from("23505")) {
+                    continue;
+                } else {
+                    Err(sqlx::Error::Database(err))?;
+                }
+            };
+        }
+    }
 
     let resp = MCaptchaDetails {
         key,
@@ -101,6 +109,24 @@ pub async fn update_token(
     Ok(HttpResponse::Ok().json(resp))
 }
 
+async fn update_token_helper(
+    key: &str,
+    name: &str,
+    host: &str,
+    data: &Data,
+) -> Result<(), sqlx::Error> {
+    sqlx::query!(
+        "UPDATE mcaptcha_config SET key = $1 
+        WHERE name = $2 AND domain_name = $3",
+        &key,
+        &name,
+        &host,
+    )
+    .execute(&data.db)
+    .await?;
+    Ok(())
+}
+
 #[post("/api/v1/mcaptcha/domain/token/get")]
 pub async fn get_token(
     payload: web::Json<MCaptchaID>,