diff --git a/app/mm-redux/types/config.ts b/app/mm-redux/types/config.ts
index c13b9f3ed..50aa1f498 100644
--- a/app/mm-redux/types/config.ts
+++ b/app/mm-redux/types/config.ts
@@ -151,6 +151,7 @@ export type Config = {
     SendEmailNotifications: string;
     SendPushNotifications: string;
     ShowEmailAddress: string;
+    ShowFullName: string;
     SiteName: string;
     SiteURL: string;
     SQLDriverName: string;
diff --git a/app/screens/user_profile/__snapshots__/user_profile.test.js.snap b/app/screens/user_profile/__snapshots__/user_profile.test.js.snap
index d0778a0d8..83fa7f51f 100644
--- a/app/screens/user_profile/__snapshots__/user_profile.test.js.snap
+++ b/app/screens/user_profile/__snapshots__/user_profile.test.js.snap
@@ -136,66 +136,6 @@ exports[`user_profile should match snapshot 1`] = `
         }
       }
     >
-      <View>
-        <Text
-          style={
-            Array [
-              Object {
-                "color": undefined,
-                "fontSize": 13,
-                "fontWeight": "600",
-                "marginBottom": 10,
-                "marginTop": 25,
-                "textTransform": "uppercase",
-              },
-              null,
-            ]
-          }
-        />
-        <Text
-          style={
-            Array [
-              Object {
-                "color": "#3d3c40",
-                "fontSize": 15,
-              },
-              null,
-            ]
-          }
-        >
-          test
-        </Text>
-      </View>
-      <View>
-        <Text
-          style={
-            Array [
-              Object {
-                "color": undefined,
-                "fontSize": 13,
-                "fontWeight": "600",
-                "marginBottom": 10,
-                "marginTop": 25,
-                "textTransform": "uppercase",
-              },
-              null,
-            ]
-          }
-        />
-        <Text
-          style={
-            Array [
-              Object {
-                "color": "#3d3c40",
-                "fontSize": 15,
-              },
-              null,
-            ]
-          }
-        >
-          fake
-        </Text>
-      </View>
       <View>
         <Text
           style={
diff --git a/app/screens/user_profile/user_profile.js b/app/screens/user_profile/user_profile.js
index 5d1cb2968..ab2e2cf9d 100644
--- a/app/screens/user_profile/user_profile.js
+++ b/app/screens/user_profile/user_profile.js
@@ -291,8 +291,8 @@ export default class UserProfile extends PureComponent {
 
         return (
             <View style={style.content}>
-                {this.buildDisplayBlock('first_name')}
-                {this.buildDisplayBlock('last_name')}
+                {this.props.config.ShowFullName === 'true' && this.buildDisplayBlock('first_name')}
+                {this.props.config.ShowFullName === 'true' && this.buildDisplayBlock('last_name')}
                 {this.props.config.ShowEmailAddress === 'true' && this.buildDisplayBlock('email')}
                 {this.buildDisplayBlock('nickname')}
                 {this.buildDisplayBlock('position')}