diff --git a/src/context/intermediate/popovers/UserProfile.tsx b/src/context/intermediate/popovers/UserProfile.tsx
index be74782d..b20b66d8 100644
--- a/src/context/intermediate/popovers/UserProfile.tsx
+++ b/src/context/intermediate/popovers/UserProfile.tsx
@@ -196,6 +196,8 @@ export const UserProfile = observer(
                             </IconButton>
                         )}
                         {!user.bot &&
+                            flags != 2 &&
+                            flags != 4 &&
                             (user.relationship ===
                                 RelationshipStatus.Incoming ||
                                 user.relationship ===
@@ -315,10 +317,14 @@ export const UserProfile = observer(
                                                 content={
                                                     <Text id="app.special.popovers.user_profile.badges.translator" />
                                                 }>
-                                                <img src="/assets/badges/translator.svg" 
-                                                     onClick={() => {
-                                                        window.open("https://weblate.insrt.uk/projects/revolt/web-app/", "_blank")
-                                                     }} 
+                                                <img
+                                                    src="/assets/badges/translator.svg"
+                                                    onClick={() => {
+                                                        window.open(
+                                                            "https://weblate.insrt.uk/projects/revolt/web-app/",
+                                                            "_blank",
+                                                        );
+                                                    }}
                                                 />
                                             </Tooltip>
                                         ) : (
@@ -343,7 +349,10 @@ export const UserProfile = observer(
                                                     size={32}
                                                     color="#efab44"
                                                     onClick={() => {
-                                                        window.open("https://insrt.uk/donate", "_blank")
+                                                        window.open(
+                                                            "https://insrt.uk/donate",
+                                                            "_blank",
+                                                        );
                                                     }}
                                                 />
                                             </Tooltip>
diff --git a/src/lib/ContextMenus.tsx b/src/lib/ContextMenus.tsx
index 610cd6cd..f8feeeee 100644
--- a/src/lib/ContextMenus.tsx
+++ b/src/lib/ContextMenus.tsx
@@ -619,7 +619,14 @@ function ContextMenus(props: Props) {
                                     break;
                                 case RelationshipStatus.None:
                                 default:
-                                    actions = ["add_friend", "block_user"];
+                                    if (
+                                        (user.flags && 2) ||
+                                        (user.flags && 4)
+                                    ) {
+                                        actions = ["block_user"];
+                                    } else {
+                                        actions = ["add_friend", "block_user"];
+                                    }
                             }
 
                             if (userPermissions & UserPermission.ViewProfile) {
diff --git a/src/pages/login/forms/FormLogin.tsx b/src/pages/login/forms/FormLogin.tsx
index dda21f87..ea7df0a7 100644
--- a/src/pages/login/forms/FormLogin.tsx
+++ b/src/pages/login/forms/FormLogin.tsx
@@ -1,8 +1,12 @@
-import { Form } from "./Form";
 import { detect } from "detect-browser";
+import { useHistory } from "react-router-dom";
+
 import { useContext } from "preact/hooks";
+
 import { OperationsContext } from "../../../context/revoltjs/RevoltClient";
 
+import { Form } from "./Form";
+
 export function FormLogin() {
     const { login } = useContext(OperationsContext);
     const history = useHistory();
@@ -10,7 +14,7 @@ export function FormLogin() {
     return (
         <Form
             page="login"
-            callback={async data => {
+            callback={async (data) => {
                 const browser = detect();
                 let device_name;
                 if (browser) {
@@ -19,12 +23,12 @@ export function FormLogin() {
                     if (window.isNative) {
                         device_name = `Revolt Desktop on ${os}`;
                     } else {
-                      if(name === "ios") {
-                          name = "safari";
-                      }else if(name === "fxios") {
-                          name = "firefox";
-                      }
-                      device_name = `${name} on ${os}`;
+                        if (name === "ios") {
+                            name = "safari";
+                        } else if (name === "fxios") {
+                            name = "firefox";
+                        }
+                        device_name = `${name} on ${os}`;
                     }
                 } else {
                     device_name = "Unknown Device";