diff --git a/src/components/shared/Layout/nav/SettingsMenu.tsx b/src/components/shared/Layout/nav/SettingsMenu.tsx
index bd327517..6c5b8a01 100644
--- a/src/components/shared/Layout/nav/SettingsMenu.tsx
+++ b/src/components/shared/Layout/nav/SettingsMenu.tsx
@@ -29,6 +29,8 @@ import TestsIcon from "@mui/icons-material/AutoAwesome";
 import { useIsMobile } from "hooks/useIsMobile";
 import { useStore } from "stores/store";
 import { AUTH_STATE } from "stores/auth/auth.slice.type";
+import { UserNameDialog } from "components/shared/UserNameDialog";
+import UsernameIcon from "@mui/icons-material/AccountCircle";
 
 export function SettingsMenu() {
   const [menuOpen, setMenuOpen] = useState<boolean>(false);
@@ -43,6 +45,8 @@ export function SettingsMenu() {
     useState(false);
 
   const [betaTestsOpen, setBetaTestsOpen] = useState(false);
+  const [usernameDialogOpen, setUsernameDialogOpen] = useState(false);
+
   const isMobile = useIsMobile();
 
   const isLoggedIn = useStore(
@@ -87,6 +91,19 @@ export function SettingsMenu() {
             : { vertical: "bottom", horizontal: "left" }
         }
       >
+        {isLoggedIn && (
+          <MenuItem
+            onClick={() => {
+              setMenuOpen(false);
+              setUsernameDialogOpen(true);
+            }}
+          >
+            <ListItemIcon>
+              <UsernameIcon />
+            </ListItemIcon>
+            <ListItemText>Update Username</ListItemText>
+          </MenuItem>
+        )}
         {isLoggedIn && (
           <MenuItem
             onClick={() => {
@@ -170,6 +187,11 @@ export function SettingsMenu() {
         open={betaTestsOpen}
         onClose={() => setBetaTestsOpen(false)}
       />
+      <UserNameDialog
+        open={usernameDialogOpen}
+        handleClose={() => setUsernameDialogOpen(false)}
+        updating
+      />
     </>
   );
 }
diff --git a/src/components/shared/UserAvatar.tsx b/src/components/shared/UserAvatar.tsx
index eb2ee00f..13ab8819 100644
--- a/src/components/shared/UserAvatar.tsx
+++ b/src/components/shared/UserAvatar.tsx
@@ -4,25 +4,37 @@ import { Avatar, Skeleton } from "@mui/material";
 
 export interface UserAvatarProps {
   uid: string;
+  forceName?: string;
+  forceShowPhoto?: boolean;
 }
 
 export function UserAvatar(props: UserAvatarProps) {
-  const { uid } = props;
+  const { uid, forceShowPhoto, forceName } = props;
   const user = useStore((store) => store.users.userMap[uid]?.doc);
   const loadUser = useStore((store) => store.users.loadUserDocument);
   useEffect(() => {
     loadUser(uid);
   }, [loadUser, uid]);
 
-  const initials = getInitials(user?.displayName ?? "User");
+  const initials = getInitials(forceName ?? user?.displayName ?? "User");
   if (!user) {
-    <Skeleton variant={"circular"}>
-      <Avatar />
-    </Skeleton>;
+    return (
+      <Skeleton variant={"circular"}>
+        <Avatar />
+      </Skeleton>
+    );
   }
+
+  let shouldShowPhoto = false;
+  if (forceShowPhoto !== undefined) {
+    shouldShowPhoto = forceShowPhoto;
+  } else {
+    shouldShowPhoto = !user.hidePhoto;
+  }
+
   return (
     <Avatar
-      src={user?.photoURL ?? undefined}
+      src={shouldShowPhoto && user.photoURL ? user.photoURL : undefined}
       sx={(theme) => ({
         bgcolor: theme.palette.darkGrey.dark,
         color: theme.palette.darkGrey.contrastText,
diff --git a/src/components/shared/UserNameDialog.tsx b/src/components/shared/UserNameDialog.tsx
index 98b275bd..9e3562ef 100644
--- a/src/components/shared/UserNameDialog.tsx
+++ b/src/components/shared/UserNameDialog.tsx
@@ -1,33 +1,62 @@
 import {
+  Button,
+  Checkbox,
   Dialog,
   DialogActions,
   DialogContent,
   DialogTitle,
+  FormControlLabel,
+  Stack,
   TextField,
   Typography,
 } from "@mui/material";
 import { LoadingButton } from "@mui/lab";
 import { useSnackbar } from "providers/SnackbarProvider/useSnackbar";
-import { updateUserName } from "lib/auth.lib";
-import { useState } from "react";
+import { updateUser } from "lib/auth.lib";
+import { useEffect, useState } from "react";
+import { useStore } from "stores/store";
+import { UserAvatar } from "./UserAvatar";
+import { UserDocument } from "types/User.type";
+import { DialogTitleWithCloseButton } from "./DialogTitleWithCloseButton";
 
 export interface UserNameDialogProps {
   open: boolean;
+  updating?: boolean;
   handleClose: () => void;
 }
 
 export function UserNameDialog(props: UserNameDialogProps) {
-  const { open, handleClose } = props;
+  const { open, updating, handleClose } = props;
   const { error } = useSnackbar();
 
-  const [name, setName] = useState("");
+  const user = useStore((store) => store.auth.user);
+  const hasHiddenPhotoUrl = useStore((store) =>
+    user?.uid ? store.users.userMap[user.uid]?.doc?.hidePhoto ?? false : false
+  );
+
+  const [name, setName] = useState(user?.displayName ?? "");
+  const [showProfileImage, setShowProfileImage] = useState(!hasHiddenPhotoUrl);
+
+  useEffect(() => {
+    setShowProfileImage(!hasHiddenPhotoUrl);
+  }, [hasHiddenPhotoUrl]);
+
   const [isLoading, setIsLoading] = useState(false);
 
   const handleSave = () => {
     if (name.trim().length > 0) {
+      const newUserDoc: UserDocument = {
+        displayName: name,
+        hidePhoto: !showProfileImage,
+      };
+      if (user?.photoURL) {
+        newUserDoc.photoURL = user.photoURL;
+      }
+
       setIsLoading(true);
-      updateUserName(name)
+      updateUser(newUserDoc)
         .then(() => {
+          location.reload();
           handleClose();
         })
         .catch((e) => {
@@ -44,21 +73,51 @@ export function UserNameDialog(props: UserNameDialogProps) {
   };
 
   return (
-    <Dialog open={open} onClose={() => {}}>
-      <DialogTitle>We did not catch your name</DialogTitle>
+    <Dialog open={open} onClose={updating ? handleClose : () => {}}>
+      {updating ? (
+        <DialogTitleWithCloseButton onClose={handleClose}>
+          Change Username
+        </DialogTitleWithCloseButton>
+      ) : (
+        <DialogTitle>We did not catch your name</DialogTitle>
+      )}
       <DialogContent>
-        <Typography>
-          Add a username so that other players in campaigns you join know who
-          you are.
-        </Typography>
-        <TextField
-          label={"Username"}
-          value={name}
-          onChange={(evt) => setName(evt.currentTarget.value)}
-          sx={{ mt: 4 }}
-        />
+        <Stack spacing={2}>
+          <Typography>
+            Usernames will be displayed to other players and GMs in campaigns.
+          </Typography>
+          <TextField
+            label={"Username"}
+            value={name}
+            onChange={(evt) => setName(evt.currentTarget.value)}
+            sx={{ mt: 4 }}
+          />
+          {user?.photoURL && (
+            <Stack direction={"row"} spacing={1}>
+              <UserAvatar
+                uid={user.uid}
+                forceShowPhoto={showProfileImage}
+                forceName={name}
+              />
+              <FormControlLabel
+                label={"Show Profile Image"}
+                control={
+                  <Checkbox
+                    checked={showProfileImage}
+                    onChange={(evt, checked) => setShowProfileImage(checked)}
+                  />
+                }
+              />
+            </Stack>
+          )}
+        </Stack>
       </DialogContent>
       <DialogActions>
+        {updating && (
+          <Button onClick={handleClose} color={"inherit"}>
+            Cancel
+          </Button>
+        )}
         <LoadingButton
           loading={isLoading}
           variant={"contained"}
diff --git a/src/lib/auth.lib.ts b/src/lib/auth.lib.ts
index 299420a6..2b8cb4a6 100644
--- a/src/lib/auth.lib.ts
+++ b/src/lib/auth.lib.ts
@@ -12,6 +12,8 @@ import {
 import { firebaseAuth } from "../config/firebase.config";
 import { BASE_ROUTES, basePaths } from "routes";
 import { getErrorMessage } from "functions/getErrorMessage";
+import { updateUserDoc } from "api-calls/user/updateUserDoc";
+import { UserDocument } from "types/User.type";
 
 const googleAuthProvider = new GoogleAuthProvider();
 
@@ -119,15 +121,27 @@ export function getUser(): Promise<User | null> {
   });
 }
 
-export function updateUserName(name: string): Promise<void> {
+export function updateUser(userDoc: UserDocument): Promise<void> {
   return new Promise((resolve, reject) => {
     const user = firebaseAuth.currentUser;
     if (!user) {
       reject(new Error("User is not logged in."));
       return;
     }
-    updateProfile(user, { displayName: name })
-      .then(() => resolve())
+    updateProfile(user, { displayName: userDoc.displayName })
+      .then(() => {
+        updateUserDoc({
+          uid: user.uid,
+          user: userDoc,
+        })
+          .then(() => {
+            resolve();
+          })
+          .catch((e) => {
+            console.error(e);
+            reject("Failed to update user.");
+          });
+      })
       .catch((e) => {
         console.error(e);
         reject("Failed to update user name.");
diff --git a/src/pages/Campaign/CampaignGMScreenPage/hooks/useSyncStore.ts b/src/pages/Campaign/CampaignGMScreenPage/hooks/useSyncStore.ts
index 67314538..25aafb26 100644
--- a/src/pages/Campaign/CampaignGMScreenPage/hooks/useSyncStore.ts
+++ b/src/pages/Campaign/CampaignGMScreenPage/hooks/useSyncStore.ts
@@ -28,6 +28,9 @@ export function useSyncStore() {
 
   useEffect(() => {
     setCampaignId(campaignId);
+    return () => {
+      setCampaignId(undefined);
+    };
   }, [campaignId, setCampaignId]);
 
   useListenToCurrentCampaignCharacters();
diff --git a/src/types/User.type.ts b/src/types/User.type.ts
index 81bfcc40..7b8d4fc9 100644
--- a/src/types/User.type.ts
+++ b/src/types/User.type.ts
@@ -1,4 +1,5 @@
 export interface UserDocument {
   displayName: string;
   photoURL?: string;
+  hidePhoto?: boolean;
 }