diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb0c517..5aa0e43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,8 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   repository will be cloned with the default branch
 * Build containers now explicitely set the PATH variable
 * Refactor of web framework
-* `api` can no longer be used as a repository name
-* CLI client now allows setting values to an empty value
 
 ### Removed
 
diff --git a/src/client/client.v b/src/client/client.v
index d68ff18..24e4444 100644
--- a/src/client/client.v
+++ b/src/client/client.v
@@ -30,10 +30,12 @@ fn (c &Client) send_request_raw(method Method, url string, params map[string]str
 		// Escape each query param
 		for k, v in params {
 			// An empty parameter should be the same as not providing it at all
-			params_escaped[k] = urllib.query_escape(v)
+			if v != '' {
+				params_escaped[k] = urllib.query_escape(v)
+			}
 		}
 
-		params_str := params_escaped.keys().map('$it=${params_escaped[it]}').join('&')
+		params_str := params_escaped.keys().map('$it=${params[it]}').join('&')
 
 		full_url = '$full_url?$params_str'
 	}
diff --git a/src/server/repo.v b/src/server/repo.v
index abfc631..5ed5d15 100644
--- a/src/server/repo.v
+++ b/src/server/repo.v
@@ -51,12 +51,6 @@ fn (mut app App) get_repo_file(repo string, arch string, filename string) web.Re
 // put_package handles publishing a package to a repository.
 ['/:repo/publish'; auth; post]
 fn (mut app App) put_package(repo string) web.Result {
-	// api is a reserved keyword for api routes & should never be allowed to be
-	// a repository.
-	if repo.to_lower() == 'api' {
-		return app.json(.bad_request, new_response("'api' is a reserved keyword & cannot be used as a repository name."))
-	}
-
 	mut pkg_path := ''
 
 	if length := app.req.header.get(.content_length) {