diff --git a/src/frontend.template.php b/src/frontend.template.php
index b5143a0..4a1e56a 100644
--- a/src/frontend.template.php
+++ b/src/frontend.template.php
@@ -117,7 +117,7 @@ $purifier = new HTMLPurifier($purifier_config);
                     ?>
                 </div>
                 <div class="col-lg-3 col-md-4 col-sm-12 col-xs-12 random-column">
-                    <a role="button" href="?random=true"
+                    <a role="button" href="?action=random"
                        class="btn btn-outline-primary col-sm-12 col-xs-12 random-button">Generate
                         Random</a>
                 </div>
diff --git a/src/router.php b/src/router.php
index ac53b03..3aef6e5 100644
--- a/src/router.php
+++ b/src/router.php
@@ -38,7 +38,7 @@ class Router {
         } elseif ($this->action === "delete_email" && isset($this->get_vars['delete_email_id']) && isset($this->get_vars['address'])) {
             return new DeleteEmailPage($this->get_vars['delete_email_id'], $this->get_vars['address'], $this->config['domains']);
 
-        } elseif (isset($this->get_vars['random'])) {
+        } elseif ($this->action === 'random') {
             return new RedirectToRandomAddressPage($this->config['domains']);
 
         } elseif (empty($this->query_string)) {