diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl
index f6e1ae68406046af8a203a941cb59d54512eb44c..aa45a5958bf2f9d5d24425d0f97fde4764a65d21 100644
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
@@ -8,6 +8,8 @@
         <#import "../navbar.ftl" as navbar>
         <@navbar.navbar "categories"/>
 
+        <#import "categoriesFunctions.ftl" as categoriesFunctions>
+
         <main>
             <div class="card main-card background-color">
                 <div class="container">
@@ -21,18 +23,19 @@
                 <div class="container">
                     <table class="bordered">
                         <#list categories as category>
-                        <tr>
+                            <#assign categoryName=categoriesFunctions.getCategoryName(category)>
+                            <tr>
                             <td>
                                 <div class="category-circle" style="background-color: ${category.color}">
                                     <span style="color: ${category.getAppropriateTextColor()}">
-                                        ${category.name?capitalize[0]}
+                                        ${categoryName?capitalize[0]}
                                     </span>
                                 </div>
                             </td>
-                            <td>${category.name}</td>
+                            <td>${categoryName}</td>
                             <td>
                                 <a href="/categories/${category.ID}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
-                                <#if (category.type.name() == "CUSTOM")>
+                                <#if (category.getType().name() == "CUSTOM")>
                                     <a href="/categories/${category.ID}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a>
                                 </#if>
                             </td>
diff --git a/src/main/resources/templates/categories/categoriesFunctions.ftl b/src/main/resources/templates/categories/categoriesFunctions.ftl
new file mode 100644
index 0000000000000000000000000000000000000000..b2a7c529e7e86483ab438927c52585c7f8b65403
--- /dev/null
+++ b/src/main/resources/templates/categories/categoriesFunctions.ftl
@@ -0,0 +1,13 @@
+<#function getCategoryName category>
+    <#if category?? && category.getName()??>
+        <#if category.getType().name() == "NONE">
+            <#return locale.getString("category.none")>
+        <#elseif category.getType().name() == "REST">
+            <#return locale.getString("category.rest")>
+        <#else>
+            <#return category.getName()>
+        </#if>
+    <#else>
+        <#return "">
+    </#if>
+</#function>
\ No newline at end of file
diff --git a/src/main/resources/templates/categories/newCategory.ftl b/src/main/resources/templates/categories/newCategory.ftl
index 2b722b0a03ca94c5e85f3c9e9cecb93a9f355944..fcaea6e2be567918036c0d30ed5e7cb5322fa55c 100644
--- a/src/main/resources/templates/categories/newCategory.ftl
+++ b/src/main/resources/templates/categories/newCategory.ftl
@@ -9,6 +9,8 @@
         <#import "../navbar.ftl" as navbar>
         <@navbar.navbar "categories"/>
 
+        <#import "categoriesFunctions.ftl" as categoriesFunctions>
+
         <main>
             <div class="card main-card background-color">
                 <div class="container">
@@ -23,10 +25,12 @@
                         <input type="hidden" name="ID" value="<#if category.getID()??>${category.getID()}</#if>">
                         <input type="hidden" name="type" value="<#if category.getType()??>${category.getType()}</#if>">
 
-                    <#-- name -->
+                        <#-- name -->
                         <div class="row">
                             <div class="input-field col s12 m12 l8 offset-l2">
-                                <input id="category-name" type="text" name="name" <@validation.validation "name"/> value="<#if category.getName()??>${category.getName()}</#if>">
+                                <#assign categoryName=categoriesFunctions.getCategoryName(category)>
+
+                                <input id="category-name" type="text" name="name" <@validation.validation "name"/> value="${categoryName}">
                                 <label for="category-name">${locale.getString("category.new.label.name")}</label>
                             </div>
                         </div>
diff --git a/src/main/resources/templates/transactions/newTransaction.ftl b/src/main/resources/templates/transactions/newTransaction.ftl
index cfe39ace01163297b0079e7740c3d38cd5b3b0d1..ee6821b8ca06d785a8198e9c7dd27dc0471475b1 100644
--- a/src/main/resources/templates/transactions/newTransaction.ftl
+++ b/src/main/resources/templates/transactions/newTransaction.ftl
@@ -9,6 +9,8 @@
         <#import "../navbar.ftl" as navbar>
         <@navbar.navbar "transactions"/>
 
+        <#import "../categories/categoriesFunctions.ftl" as categoriesFunctions>
+
         <main>
             <div class="card main-card background-color">
                 <div class="container">
@@ -63,16 +65,18 @@
                             <div class="input-field col s12 m12 l8 offset-l2">
                                 <select id="transaction-category" name="category" <@validation.validation "category"/>>
                                     <#list categories as category>
+                                        <#assign categoryName=categoriesFunctions.getCategoryName(category)>
+
                                         <#if transaction.getCategory()??>
                                             <#if transaction.getCategory().getID() == category.getID()>
-                                                <option selected value="${category.getID()}">${category.getName()}</option>
+                                                <option selected value="${category.getID()}">${categoryName}</option>
                                             <#elseif category.getType() != "REST">
-                                                <option value="${category.getID()}">${category.getName()}</option>
+                                                <option value="${category.getID()}">${categoryName}</option>
                                             </#if>
                                         <#elseif category.getType() == "NONE">
-                                            <option selected value="${category.getID()}">${category.getName()}</option>
+                                            <option selected value="${category.getID()}">${categoryName}</option>
                                         <#elseif category.getType() != "REST">
-                                            <option value="${category.getID()}">${category.getName()}</option>
+                                            <option value="${category.getID()}">${categoryName}</option>
                                         </#if>
                                     </#list>
                                 </select>