diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Database/Entry.java b/app/src/main/java/org/shadowice/flocke/andotp/Database/Entry.java
index a1c824e5..04e4310c 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Database/Entry.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Database/Entry.java
@@ -506,18 +506,19 @@ public class Entry {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         Entry entry = (Entry) o;
-        return period == entry.period &&
-                digits == entry.digits &&
-                type == entry.type &&
+        return type == entry.type &&
+                period == entry.period &&
                 counter == entry.counter &&
+                digits == entry.digits &&
                 algorithm == entry.algorithm &&
                 Arrays.equals(secret, entry.secret) &&
-                Objects.equals(label, entry.label);
+                Objects.equals(label, entry.label) &&
+                Objects.equals(issuer, entry.issuer);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(type, period, counter, digits, algorithm, secret, label);
+        return Objects.hash(type, period, counter, digits, algorithm, secret, label, issuer);
     }
 
     public void setColor(int color) {