diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index 419dc47c0..7d32344c3 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -3,7 +3,7 @@
     <div>
       <label for="name">{{i18n 'admin.badges.name'}}</label>
       {{#if readOnly}}
-        {{input type="text" name="name" value=buffered.displayName disabled=true}}
+        {{input type="text" name="name" value=buffered.name disabled=true}}
       {{else}}
         {{input type="text" name="name" value=buffered.name}}
       {{/if}}
@@ -45,7 +45,7 @@
     <div>
       <label for="description">{{i18n 'admin.badges.description'}}</label>
       {{#if buffered.system}}
-        {{textarea name="description" value=buffered.displayDescription disabled=true}}
+        {{textarea name="description" value=buffered.description disabled=true}}
       {{else}}
         {{textarea name="description" value=buffered.description}}
       {{/if}}
diff --git a/app/models/badge.rb b/app/models/badge.rb
index 3bee2e6be..484631b5b 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -158,21 +158,13 @@ SQL
   end
 
   def display_name
-    if self.system?
-      key = "badges.#{i18n_name}.name"
-      I18n.t(key, default: self.name)
-    else
-      self.name
-    end
+    key = "badges.#{i18n_name}.name"
+    I18n.t(key, default: self.name)
   end
 
   def long_description
-    if self[:long_description].present?
-      self[:long_description]
-    else
-      key = "badges.#{i18n_name}.long_description"
-      I18n.t(key, default: '')
-    end
+    key = "badges.#{i18n_name}.long_description"
+    I18n.t(key, default: self[:long_description] || '')
   end
 
   def long_description=(val)
@@ -184,12 +176,8 @@ SQL
   end
 
   def description
-    if self[:description].present?
-      self[:description]
-    else
-      key = "badges.#{i18n_name}.description"
-      I18n.t(key, default: '')
-    end
+    key = "badges.#{i18n_name}.description"
+    I18n.t(key, default: self[:description] || '')
   end
 
   def description=(val)