diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
index ab1e74d6..8d35c95c 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
@@ -113,11 +113,13 @@ public class EntryHolder extends RecyclerView.ViewHolder {
         // only show the button if this entry is of type HotpInfo
         _buttonRefresh.setVisibility(entry.getInfo() instanceof HotpInfo ? View.VISIBLE : View.GONE);
 
-        _profileIssuer.setText(entry.getIssuer());
-        _profileName.setText("");
-        if (showAccountName) {
-            _profileName.setText(" - " + entry.getName());
+        String profileIssuer = entry.getIssuer();
+        String profileName = showAccountName ? entry.getName() : "";
+        if (!profileIssuer.isEmpty() && !profileName.isEmpty()) {
+            profileName = " - " + profileName;
         }
+        _profileIssuer.setText(profileIssuer);
+        _profileName.setText(profileName);
 
         if (_hidden) {
             hideCode();