diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee
index 06fba778..4b8c247d 100644
--- a/app/coffee/modules/admin/project-profile.coffee
+++ b/app/coffee/modules/admin/project-profile.coffee
@@ -89,16 +89,16 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin)
 
             @scope.projectId = project.id
             @scope.project = project
-            @scope.pointsList = _.sortBy(project.points, "order")
+            @scope.epicStatusList = _.sortBy(project.epic_statuses, "order")
             @scope.usStatusList = _.sortBy(project.us_statuses, "order")
+            @scope.pointsList = _.sortBy(project.points, "order")
             @scope.taskStatusList = _.sortBy(project.task_statuses, "order")
-            @scope.prioritiesList = _.sortBy(project.priorities, "order")
-            @scope.severitiesList = _.sortBy(project.severities, "order")
             @scope.issueTypesList = _.sortBy(project.issue_types, "order")
             @scope.issueStatusList = _.sortBy(project.issue_statuses, "order")
+            @scope.prioritiesList = _.sortBy(project.priorities, "order")
+            @scope.severitiesList = _.sortBy(project.severities, "order")
             @scope.$emit('project:loaded', project)
 
-
             @scope.projectTags = _.map @scope.project.tags, (it) =>
                 return [it, @scope.project.tags_colors[it]]
 
diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index c79fd001..2feafc66 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -720,13 +720,14 @@
             "DEFAULT_DELETE_MESSAGE": "the invitation to {{email}}"
         },
         "DEFAULT_VALUES": {
+            "LABEL_EPIC_STATUS": "Default value for epic status selector",
+            "LABEL_US_STATUS": "Default value for user story status selector",
             "LABEL_POINTS": "Default value for points selector",
-            "LABEL_US": "Default value for US status selector",
             "LABEL_TASK_STATUS": "Default value for task status selector",
-            "LABEL_PRIORITY": "Default value for priority selector",
-            "LABEL_SEVERITY": "Default value for severity selector",
             "LABEL_ISSUE_TYPE": "Default value for issue type selector",
-            "LABEL_ISSUE_STATUS": "Default value for issue status selector"
+            "LABEL_ISSUE_STATUS": "Default value for issue status selector",
+            "LABEL_PRIORITY": "Default value for priority selector",
+            "LABEL_SEVERITY": "Default value for severity selector"
         },
         "STATUS": {
             "PLACEHOLDER_WRITE_STATUS_NAME": "Write a name for the new status"
diff --git a/app/partials/includes/modules/admin/default-values.jade b/app/partials/includes/modules/admin/default-values.jade
index a8ab9e6e..cd3b3745 100644
--- a/app/partials/includes/modules/admin/default-values.jade
+++ b/app/partials/includes/modules/admin/default-values.jade
@@ -1,20 +1,40 @@
 section.default-values
     form
+
+        //- Epics
+        fieldset
+            label(for="default-value-epic", translate="ADMIN.DEFAULT_VALUES.LABEL_EPIC_STATUS")
+            select(id="default-value-epic", ng-model="project.default_epic_status",
+                   ng-options="s.id as s.name for s in epicStatusList")
+
+        //- User stories
+        fieldset
+            label(for="default-value-us", translate="ADMIN.DEFAULT_VALUES.LABEL_US_STATUS")
+            select(id="default-value-us", ng-model="project.default_us_status",
+                   ng-options="s.id as s.name for s in usStatusList")
+
         fieldset
             label(for="default-points", translate="ADMIN.DEFAULT_VALUES.LABEL_POINTS")
             select(id="default-points", ng-model="project.default_points",
                    ng-options="s.id as s.name for s in pointsList")
 
-        fieldset
-            label(for="default-value-us", translate="ADMIN.DEFAULT_VALUES.LABEL_US")
-            select(id="default-value-us", ng-model="project.default_us_status",
-                   ng-options="s.id as s.name for s in usStatusList")
-
+        //- Tasks
         fieldset
             label(for="default-value-task", translate="ADMIN.DEFAULT_VALUES.LABEL_TASK_STATUS")
             select(id="default-value-task", ng-model="project.default_task_status",
                    ng-options="s.id as s.name for s in taskStatusList")
 
+        //- Issues
+        fieldset
+            label(for="default-value-issue-type", translate="ADMIN.DEFAULT_VALUES.LABEL_ISSUE_TYPE")
+            select(id="default-value-issue-type", ng-model="project.default_issue_type",
+                   ng-options="s.id as s.name for s in issueTypesList")
+
+        fieldset
+            label(for="default-value-issue-status", translate="ADMIN.DEFAULT_VALUES.LABEL_ISSUE_STATUS")
+            select(id="default-value-issue-status", ng-model="project.default_issue_status",
+                   ng-options="s.id as s.name for s in issueStatusList")
+
         fieldset
             label(for="default-value-priority", translate="ADMIN.DEFAULT_VALUES.LABEL_PRIORITY")
             select(id="default-value-priority", ng-model="project.default_priority",
@@ -25,16 +45,6 @@ section.default-values
             select(id="default-value-severity", ng-model="project.default_severity",
                    ng-options="s.id as s.name for s in severitiesList")
 
-        fieldset
-            label(for="default-value-issue-type", translate="ADMIN.DEFAULT_VALUES.LABEL_ISSUE_TYPE")
-            select(id="default-value-issue-type", ng-model="project.default_issue_type",
-                   ng-options="s.id as s.name for s in issueTypesList")
-
-        fieldset
-            label(for="default-value-issue-status", translate="ADMIN.DEFAULT_VALUES.LABEL_ISSUE_STATUS")
-            select(id="default-value-issue-status", ng-model="project.default_issue_status",
-                   ng-options="s.id as s.name for s in issueStatusList")
-
         fieldset
             button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}")
                 span(translate="COMMON.SAVE")