diff --git a/src/account.c b/src/account.c
index 3402393..4135ece 100644
--- a/src/account.c
+++ b/src/account.c
@@ -83,15 +83,15 @@ char* construct_account_page(mastodont_t* api,
                             acct->display_name,
                             acct->acct,
                             config_url_prefix,
-                            acct->acct,
+                            acct->id,
                             !relationship ? "" : MSTDNT_FLAG_ISSET(relationship->flags, MSTDNT_RELATIONSHIP_NOTIFYING) ? "un" : "",
                             !relationship ? "" : MSTDNT_FLAG_ISSET(relationship->flags, MSTDNT_RELATIONSHIP_NOTIFYING) ? "Unsubscribe" : "Subscribe",
                             config_url_prefix,
-                            acct->acct,
+                            acct->id,
                             !relationship ? "" : MSTDNT_FLAG_ISSET(relationship->flags, MSTDNT_RELATIONSHIP_BLOCKING) ? "un" : "",
                             !relationship ? "" : MSTDNT_FLAG_ISSET(relationship->flags, MSTDNT_RELATIONSHIP_BLOCKING) ? "Unblock" : "Block",
                             config_url_prefix,
-                            acct->acct,
+                            acct->id,
                             !relationship ? "" : MSTDNT_FLAG_ISSET(relationship->flags, MSTDNT_RELATIONSHIP_MUTING) ? "un" : "",
                             !relationship ? "" : MSTDNT_FLAG_ISSET(relationship->flags, MSTDNT_RELATIONSHIP_MUTING) ? "Unmute" : "Mute",
                             "Statuses",
@@ -173,7 +173,7 @@ void content_account_action(struct session* ssn, mastodont_t* api, char** data)
 {
     char* referer = getenv("HTTP_REFERER");
     struct mstdnt_storage storage = { 0 };
-    struct mstdnt_account acct = { 0 };
+    struct mstdnt_relationship acct = { 0 };
     
     if (strcmp(data[1], "follow") == 0)
         mastodont_follow_account(api, data[0], &storage, &acct);
diff --git a/src/main.c b/src/main.c
index 0335d7b..24401f4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -83,7 +83,7 @@ int main(void)
             /* { "/config/account", content_config_account }, */
             { "/login", content_login },
             { "/test", content_test },
-            { "/@:/action/:", content_account_action },
+            { "/user/:/action/:", content_account_action },
             { "/@:", content_account },
             { "/status/create", content_status_create },
             { "/status/:/interact", status_interact },
diff --git a/static/account.html b/static/account.html
index 644a482..b81d772 100644
--- a/static/account.html
+++ b/static/account.html
@@ -11,9 +11,9 @@
       Menu
       <div class="menu menu-options">
         <ul>
-          <li><a class="nolink" href="%s/@%s/action/%ssubscribe"><input class="btn-menu" type="button" value="%s"></a></li>
-          <li><a class="nolink" href="%s/@%s/action/%sblock"><input class="btn-menu" type="button" value="%s"></a></li>
-          <li><a class="nolink" href="%s/@%s/action/%smute"><input class="btn-menu" type="button" value="%s"></a></li>
+          <li><a class="nolink" href="%s/user/%s/action/%ssubscribe"><input class="btn-menu" type="button" value="%s"></a></li>
+          <li><a class="nolink" href="%s/user/%s/action/%sblock"><input class="btn-menu" type="button" value="%s"></a></li>
+          <li><a class="nolink" href="%s/user/%s/action/%smute"><input class="btn-menu" type="button" value="%s"></a></li>
         </ul>
       </div>
     </span>