diff --git a/frontend/src/assets/styles/_extra.scss b/frontend/src/assets/styles/_extra.scss
index 49359a7bc4..b5887bdfb5 100644
--- a/frontend/src/assets/styles/_extra.scss
+++ b/frontend/src/assets/styles/_extra.scss
@@ -616,3 +616,8 @@ a[href="https://www.mapbox.com/map-feedback/"]
 .link:focus {
   outline: revert;
 }
+
+// Override tachyons font-family for code tag
+.code {
+  font-family: inherit;
+}
diff --git a/frontend/src/views/settings.js b/frontend/src/views/settings.js
index 4a558c6b05..8aa65032ec 100644
--- a/frontend/src/views/settings.js
+++ b/frontend/src/views/settings.js
@@ -34,7 +34,7 @@ export function Settings() {
         </div>
         <div className="fl w-100 w-40-l pb3 pl3-l">
           <PersonalInformationForm />
-          <OSMCard username={userDetails.username} />
+          {userDetails?.username && <OSMCard username={userDetails.username} />}
         </div>
       </div>
     </div>