diff --git a/docs/admin/repo_admin/repo-extra-fields.rst b/docs/admin/repo_admin/repo-extra-fields.rst
index 0e5aecbc..bcf3edc8 100644
--- a/docs/admin/repo_admin/repo-extra-fields.rst
+++ b/docs/admin/repo_admin/repo-extra-fields.rst
@@ -31,11 +31,12 @@ To configure extra fields per repository, use the following steps:
 
 .. image:: ../../images/extra-repo-fields.png
 
-The most important is the `New field key` variable which under the value will
+3. The most important is the `New field key` variable which under the value will
 be stored. It needs to be unique for each repository. The label and description
 will be generated in repository settings where users can actually save some
 values inside generated extra fields.
 
+.. image:: ../../images/extra-repo-fields-set-value.png
 
 Example Usage in extensions
 ---------------------------
diff --git a/docs/images/extra-repo-fields-set-value.png b/docs/images/extra-repo-fields-set-value.png
new file mode 100644
index 00000000..feff8fca
Binary files /dev/null and b/docs/images/extra-repo-fields-set-value.png differ
diff --git a/rhodecode/templates/admin/repos/repo_edit_fields.mako b/rhodecode/templates/admin/repos/repo_edit_fields.mako
index 14d7bbf1..38809d5e 100644
--- a/rhodecode/templates/admin/repos/repo_edit_fields.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_fields.mako
@@ -61,6 +61,12 @@
                         </div>
                      </div>
 
+                    <div class="field">
+                        <p class="alert-warning" style="display:inline-block;padding:8px 12px;">
+                            <strong>${_("Note")}:</strong> ${_("You can set values for your custom fields in")} <strong>${_("Repository Settings")}</strong> ${_("(bottom of the page)")}
+                        </p>
+                    </div>
+
                     <div class="buttons">
                       ${h.submit('save',_('Add'),class_="btn")}
                       ${h.reset('reset',_('Reset'),class_="btn")}