diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4ad50a..6072cf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased](https://git.rustybever.be/Chewing_Bever/otter)
 
-* CLI command to add new users
 * Public sign-up page (disabled by default)
 * Private sign-up links
+* New CLI commands
+    * Add users
+    * Generate signup links
 
 ## [0.2.1](https://git.rustybever.be/Chewing_Bever/otter/src/tag/0.2.1)
 
diff --git a/gpodder/src/repository/admin.rs b/gpodder/src/repository/admin.rs
index 3c98a52..b8b3d7b 100644
--- a/gpodder/src/repository/admin.rs
+++ b/gpodder/src/repository/admin.rs
@@ -1,6 +1,3 @@
-use chrono::Utc;
-use rand::Rng;
-
 use crate::{AuthErr, Page, models};
 
 /// Admin view of the repository, providing methods only allowed by admins
@@ -17,16 +14,4 @@ impl<'a> AdminRepository<'a> {
     ) -> Result<Vec<models::User>, AuthErr> {
         self.store.paginated_users(page, filter)
     }
-
-    /// Generate a new unique signup link ID
-    pub fn generate_signup_link(&self) -> Result<models::SignupLink, AuthErr> {
-        let link = models::SignupLink {
-            id: rand::thread_rng().r#gen(),
-            time_created: Utc::now(),
-        };
-
-        self.store.insert_signup_link(&link)?;
-
-        Ok(link)
-    }
 }
diff --git a/gpodder/src/repository/mod.rs b/gpodder/src/repository/mod.rs
index 100f49f..fe7eeec 100644
--- a/gpodder/src/repository/mod.rs
+++ b/gpodder/src/repository/mod.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 
 use argon2::{Argon2, PasswordHash, PasswordHasher, PasswordVerifier, password_hash::SaltString};
 use chrono::{TimeDelta, Utc};
-use rand::rngs::OsRng;
+use rand::{Rng, rngs::OsRng};
 
 use crate::{
     SignupLink, models,
@@ -126,4 +126,16 @@ impl GpodderRepository {
     pub fn remove_signup_link(&self, id: i64) -> Result<bool, AuthErr> {
         self.store.remove_signup_link(id)
     }
+
+    /// Generate a new unique signup link ID
+    pub fn generate_signup_link(&self) -> Result<models::SignupLink, AuthErr> {
+        let link = models::SignupLink {
+            id: rand::thread_rng().r#gen(),
+            time_created: Utc::now(),
+        };
+
+        self.store.insert_signup_link(&link)?;
+
+        Ok(link)
+    }
 }
diff --git a/otter/src/cli/gpo.rs b/otter/src/cli/gpo.rs
index a0d72e5..aaa01b5 100644
--- a/otter/src/cli/gpo.rs
+++ b/otter/src/cli/gpo.rs
@@ -18,7 +18,10 @@ pub enum Command {
 
 #[derive(Subcommand)]
 pub enum UserCommand {
+    /// Add a new user
     Add { username: String, password: String },
+    /// Generate a signup link ID
+    GenerateSignupLink,
 }
 
 impl Command {
@@ -59,6 +62,11 @@ impl UserCommand {
             Self::Add { username, password } => {
                 store.create_user(username, password)?;
             }
+            Self::GenerateSignupLink => {
+                let link = store.generate_signup_link()?;
+
+                println!("/signup/{}", link.id);
+            }
         }
 
         Ok(())