diff --git a/discord_rss_bot/templates/blacklist.html b/discord_rss_bot/templates/blacklist.html
index 705e118..33ca828 100644
--- a/discord_rss_bot/templates/blacklist.html
+++ b/discord_rss_bot/templates/blacklist.html
@@ -35,33 +35,25 @@
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="blacklist_title"
-                           value="{% if blacklist_title %}
-                                      {{- blacklist_title -}}
-                                  {% endif %}"/>
+                           value="{%- if blacklist_title -%}{{ blacklist_title }}{%- endif -%}"/>
                     <label for="blacklist_summary" class="col-sm-6 col-form-label">Blacklist - Summary</label>
                     <input name="blacklist_summary"
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="blacklist_summary"
-                           value="{% if blacklist_summary %}
-                                      {{- blacklist_summary -}}
-                                  {% endif %}"/>
+                           value="{%- if blacklist_summary -%}{{ blacklist_summary }}{%- endif -%}"/>
                     <label for="blacklist_content" class="col-sm-6 col-form-label">Blacklist - Content</label>
                     <input name="blacklist_content"
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="blacklist_content"
-                           value="{% if blacklist_content %}
-                                      {{- blacklist_content -}}
-                                  {% endif %}"/>
+                           value="{%- if blacklist_content -%}{{ blacklist_content }}{%- endif -%}"/>
                     <label for="blacklist_author" class="col-sm-6 col-form-label">Blacklist - Author</label>
                     <input name="blacklist_author"
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="blacklist_author"
-                           value="{% if blacklist_author %}
-                                      {{- blacklist_author -}}
-                                  {% endif %}"/>
+                           value="{%- if blacklist_author -%}{{ blacklist_author }}{%- endif -%}"/>
                 </div>
             </div>
             <!-- Add a hidden feed_url field to the form -->
diff --git a/discord_rss_bot/templates/whitelist.html b/discord_rss_bot/templates/whitelist.html
index 129acb5..9f474dc 100644
--- a/discord_rss_bot/templates/whitelist.html
+++ b/discord_rss_bot/templates/whitelist.html
@@ -35,33 +35,25 @@
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="whitelist_title"
-                           value="{% if whitelist_title %}
-                                      {{- whitelist_title -}}
-                                  {% endif %}"/>
+                           value="{%- if whitelist_title -%}{{ whitelist_title }} {%- endif -%}"/>
                     <label for="whitelist_summary" class="col-sm-6 col-form-label">Whitelist - Summary</label>
                     <input name="whitelist_summary"
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="whitelist_summary"
-                           value="{% if whitelist_summary %}
-                                      {{- whitelist_summary -}}
-                                  {% endif %}"/>
+                           value="{%- if whitelist_summary -%}{{ whitelist_summary }}{%- endif -%}"/>
                     <label for="whitelist_content" class="col-sm-6 col-form-label">Whitelist - Content</label>
                     <input name="whitelist_content"
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="whitelist_content"
-                           value="{% if whitelist_content %}
-                                      {{- whitelist_content -}}
-                                  {% endif %}"/>
+                           value="{%- if whitelist_content -%}{{ whitelist_content }}{%- endif -%}"/>
                     <label for="whitelist_author" class="col-sm-6 col-form-label">Whitelist - Author</label>
                     <input name="whitelist_author"
                            type="text"
                            class="form-control bg-dark border-dark text-muted"
                            id="whitelist_author"
-                           value="{% if whitelist_author %}
-                                      {{- whitelist_author -}}
-                                  {% endif %}"/>
+                           value="{%- if whitelist_author -%} {{ whitelist_author }} {%- endif -%}"/>
                 </div>
             </div>
             <!-- Add a hidden feed_url field to the form -->