diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8df828091..0cbb32df1 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -383,7 +383,7 @@ ssh_key_deletion_success = The SSH key has been deleted.
 gpg_key_deletion_success = The GPG key has been deleted.
 add_on = Added on
 valid_until = Valid until
-never = never
+valid_forever = Valid forever
 last_used = Last used on
 no_activity = No recent activity
 key_state_desc = This key has been used in the last 7 days
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index a20bc8e14..6d30bc733 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -26,7 +26,7 @@
             <div class="activity meta">
                 <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Added}}</span></i>
                  -
-                <i>{{$.i18n.Tr "settings.valid_until"}} <span>{{if not .Expired.IsZero }}{{DateFmtShort .Expired}}{{else}}{{$.i18n.Tr "settings.never"}}{{end}}</span></i>
+				<i>{{if not .Expired.IsZero }}{{$.i18n.Tr "settings.valid_until"}} <span>{{DateFmtShort .Expired}}</span>{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}}</i>
             </div>
           </div>
       </div>