diff --git a/src/app/browser/main/discord.tsx b/src/app/browser/main/discord.tsx
index e43801c..513a2bf 100644
--- a/src/app/browser/main/discord.tsx
+++ b/src/app/browser/main/discord.tsx
@@ -89,7 +89,7 @@ function DiscordPresence(props: {
     const user_image_url = props.user ?
         props.user.avatar ? 'https://cdn.discordapp.com/avatars/' + props.user.id + '/' + props.user.avatar + '.png' :
         !props.user.discriminator || props.user.discriminator === '0' ?
-            'https://cdn.discordapp.com/embed/avatars/' + ((parseInt(props.user.id) >> 22) % 5) + '.png' :
+            'https://cdn.discordapp.com/embed/avatars/' + ((parseInt(props.user.id) >> 22) % 6) + '.png' :
         'https://cdn.discordapp.com/embed/avatars/' + (parseInt(props.user.discriminator) % 5) + '.png' : undefined;
 
     return <View style={styles.discordPresenceContainer}>
@@ -101,7 +101,9 @@ function DiscordPresence(props: {
         {props.user ? <View style={styles.discordUser}>
             <Image source={{uri: user_image_url, width: 18, height: 18}} style={styles.discordUserImage} />
             <Text style={styles.discordUserText} numberOfLines={1} ellipsizeMode="tail">
-                {props.user.username}<Text style={styles.discordUserDiscriminator}>#{props.user.discriminator}</Text>
+                {props.user.username}
+                {props.user.discriminator && props.user.discriminator !== '0' ?
+                    <Text style={styles.discordUserDiscriminator}>#{props.user.discriminator}</Text> : null}
             </Text>
         </View> : <View style={styles.discordUser}>
             <Text style={styles.discordUserText} numberOfLines={1} ellipsizeMode="tail">Not connected to Discord</Text>
diff --git a/src/app/browser/preferences/index.tsx b/src/app/browser/preferences/index.tsx
index 96e73b5..902144b 100644
--- a/src/app/browser/preferences/index.tsx
+++ b/src/app/browser/preferences/index.tsx
@@ -106,7 +106,8 @@ export default function Preferences(props: PreferencesProps) {
             value={discord_options.user} />);
     }
     for (const user of discord_users ?? []) {
-        discord_user_picker.push(<Picker.Item key={user.id} label={user.username + '#' + user.discriminator}
+        discord_user_picker.push(<Picker.Item key={user.id}
+            label={user.username + (user.discriminator && user.discriminator !== '0' ? '#' + user.discriminator : '')}
             value={user.id} />);
     }