diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/CategoryType.java b/src/main/java/de/deadlocker8/budgetmaster/entities/CategoryType.java
index 9547a33ea7c8f8abcbebddb4cd5cb78a1e8c6dd2..f8a89f21046dcd1627bd15114507ae0e165bd0ec 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/entities/CategoryType.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/entities/CategoryType.java
@@ -3,5 +3,5 @@ package de.deadlocker8.budgetmaster.entities;
 
 public enum CategoryType
 {
-	NONE, REST, CUSTOM;
+	NONE, REST, CUSTOM
 }
diff --git a/src/main/resources/templates/payments/newPayment.ftl b/src/main/resources/templates/payments/newPayment.ftl
index d6910552ee203143684832fd9480bc70f5f5bbe2..c1f2535e1545a600f3d7e0d8680db773d601b3c9 100644
--- a/src/main/resources/templates/payments/newPayment.ftl
+++ b/src/main/resources/templates/payments/newPayment.ftl
@@ -62,7 +62,7 @@
                                         <#else>
                                             <#if category.getType() == "NONE">
                                                 <option selected value="${category.getID()}">${category.getName()}</option>
-                                            <#else>
+                                            <#elseif category.getType() != "REST">
                                                 <option value="${category.getID()}">${category.getName()}</option>
                                             </#if>
                                         </#if>
diff --git a/src/main/resources/templates/payments/payments.ftl b/src/main/resources/templates/payments/payments.ftl
index a7a721cfe9620d65c0251c2769fa37ce8bf27899..e0df3f0801702717b7af4bf5a0b100d242ddcab7 100644
--- a/src/main/resources/templates/payments/payments.ftl
+++ b/src/main/resources/templates/payments/payments.ftl
@@ -45,8 +45,8 @@
                                 <td class="bold text-dark-green">${helpers.getCurrencyString(payment.amount)}</td>
                             </#if>
                             <td>
-                                <a href="/payments/${payment.ID}/edit" class="btn-flat no-padding"><i class="material-icons left">edit</i></a>
                                 <#if (payment.category.type.name() != "REST")>
+                                    <a href="/payments/${payment.ID}/edit" class="btn-flat no-padding"><i class="material-icons left">edit</i></a>
                                     <a href="/payments/${payment.ID}/requestDelete" class="btn-flat no-padding"><i class="material-icons left">delete</i></a>
                                 </#if>
                             </td>