diff --git a/bookstore/src/main/resources/messages.properties b/bookstore/src/main/resources/messages.properties
index 7f2ffb6..08b4d12 100644
--- a/bookstore/src/main/resources/messages.properties
+++ b/bookstore/src/main/resources/messages.properties
@@ -39,6 +39,9 @@ book.error.year                    = Invalid year
 book.error.price                   = Invalid price
 book.error.isbn.exists             = ISBN code already exists
 book.error.id.invalid              = Wrong book
+
+book.null.author                   = Unknown
+book.null.category                 = None
                         
 page.title.browser.list            = Bookstore page
 page.title.browser.add             = Add book
diff --git a/bookstore/src/main/resources/templates/bookadd.html b/bookstore/src/main/resources/templates/bookadd.html
index 3e0cd81..37af943 100644
--- a/bookstore/src/main/resources/templates/bookadd.html
+++ b/bookstore/src/main/resources/templates/bookadd.html
@@ -204,7 +204,10 @@
     				th:value="${category.id}"
     				th:text="${category.name}"
     				>(obj) category.name</option>
-    				<option value="">None</option>
+					<option value="" 
+					th:text="${#messages.msgOrNull('book.null.category')} ?: 'book.null.category'">
+					book.null.category
+					</option>
     			</select>
     			<small class="form-text text-muted"
     			th:text="${#messages.msgOrNull('book.desc.set.category')} ?: 'book.desc.set.category'">
diff --git a/bookstore/src/main/resources/templates/bookedit.html b/bookstore/src/main/resources/templates/bookedit.html
index 680c44c..b514377 100644
--- a/bookstore/src/main/resources/templates/bookedit.html
+++ b/bookstore/src/main/resources/templates/bookedit.html
@@ -204,7 +204,10 @@
     				th:value="${category.id}"
     				th:text="${category.name}"
     				>(obj) category.name</option>
-					<option value="">None</option>
+					<option value="" 
+					th:text="${#messages.msgOrNull('book.null.category')} ?: 'book.null.category'">
+					book.null.category
+					</option>
     			</select>
 
     			<small class="form-text text-muted"
diff --git a/bookstore/src/main/resources/templates/booklist.html b/bookstore/src/main/resources/templates/booklist.html
index 0363ff2..1d414f6 100644
--- a/bookstore/src/main/resources/templates/booklist.html
+++ b/bookstore/src/main/resources/templates/booklist.html
@@ -45,15 +45,19 @@
                   |     Set author last name
                   |   else:
                   |     Set empty string for last name
+                ##########
                 else:
-                  Author is 'Unknown'
+                  |-> Check if book.null.author exists. If yes, then:
+                  |     Get value from book.null.author message key
+                  |   else:
+                  |     Author is string value 'book.null.author'
 				*/-->
-				<td th:text="${book.author != null} ? ( (${book.author.firstName != null} ? (${book.author.firstName} + ' ') : '') + (${book.author.lastName != null} ? ${book.author.lastName} : '') ) : 'Unknown'">(obj) book.author.firstName (obj) book.author.lastName</td>
+				<td th:text="${book.author != null} ? ( (${book.author.firstName != null} ? (${book.author.firstName} + ' ') : '') + (${book.author.lastName != null} ? ${book.author.lastName} : '') ) : (${#messages.msgOrNull('book.null.author')} ?: 'book.null.author')">(obj) book.author.firstName (obj) book.author.lastName</td>
 				
 				<td th:text="${book.title}">(obj) book.title</td>
 				<td th:text="${book.isbn}">(obj) book.isbn</td>
 				<td th:text="${book.year}">(obj) book.year</td>
-				<td th:text="${book.category != null} ? ${book.category.name} : 'None'">(obj) book.category.name</td>
+				<td th:text="${book.category != null} ? ${book.category.name} : (${#messages.msgOrNull('book.null.category')} ?: 'book.null.category')">(obj) book.category.name</td>
 				<td th:text="(${#numbers.formatDecimal(book.price, 1, 2)} ?: '0.00') + ' ' + (${#messages.msgOrNull('page.symbols.currency')} ?: 'page.symbols.currency')">
 				0.00 page.symbols.currency
 				</td>