diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json
index 570dfd7f..02278cf2 100644
--- a/app/locales/locale-en.json
+++ b/app/locales/locale-en.json
@@ -954,7 +954,7 @@
         "MOVE_US_TO_CURRENT_SPRINT": "Move to Current Sprint",
         "SHOW_FILTERS": "Show filters",
         "SHOW_TAGS": "Show tags",
-        "EMPTY": "Your backlog is empty!",
+        "EMPTY": "The backlog is empty!",
         "CREATE_NEW_US": "Create a new US",
         "CREATE_NEW_US_EMPTY_HELP": "You may want to create a new user story",
         "EXCESS_OF_POINTS": "Excess of points",
@@ -1015,7 +1015,7 @@
             "LINK_TASKBOARD": "Sprint Taskboard",
             "TITLE_LINK_TASKBOARD": "Go to Taskboard of \"{{name}}\"",
             "NUMBER_SPRINTS": "<br/>sprints",
-            "EMPTY": "YOU HAVE NO SPRINTS",
+            "EMPTY": "There are no sprints yet",
             "WARNING_EMPTY_SPRINT": "Drop here Stories from your backlog to start a new sprint",
             "TITLE_ACTION_NEW_SPRINT": "Add new sprint",
             "TEXT_ACTION_NEW_SPRINT": "You may want to create a new sprint in your project",
diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade
index ad6b8ffc..50bcb97f 100644
--- a/app/partials/backlog/backlog.jade
+++ b/app/partials/backlog/backlog.jade
@@ -50,13 +50,18 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
         section.backlog-table(ng-class="{'hidden': !userstories.length}")
             include ../includes/modules/backlog-table
 
-        div.empty-backlog(ng-class="{'hidden': userstories.length}", tg-backlog-empty-sortable)
+        div.empty-backlog(
+            ng-class="{'hidden': userstories === undefined || userstories.length}"
+            tg-backlog-empty-sortable
+        )
             img(
                 src="/images/backlog-empty.png"
                 alt="{{'BACKLOG.EMPTY' | translate}}"
             )
             p.title(translate="BACKLOG.EMPTY")
-            a(href="", title="{{'BACKLOG.CREATE_NEW_US' | translate}}"
+            a(
+                href=""
+                title="{{'BACKLOG.CREATE_NEW_US' | translate}}"
                 ng-click="ctrl.addNewUs('standard')"
                 tg-check-permission="add_us"
                 translate="BACKLOG.CREATE_NEW_US_EMPTY_HELP"
diff --git a/app/partials/includes/modules/issues-table.jade b/app/partials/includes/modules/issues-table.jade
index e33b7d01..f696730d 100644
--- a/app/partials/includes/modules/issues-table.jade
+++ b/app/partials/includes/modules/issues-table.jade
@@ -51,10 +51,16 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}")
                 figure.avatar
                 span.icon.icon-arrow-bottom(tg-check-permission="modify_issue")
 
-section.empty-issues(ng-if="!issues.length")
+section.empty-issues(ng-if="issues != undefined && issues.length == 0")
     img(
         src="../../images/issues-empty.png",
         alt="{{ISSUES.TABLE.EMPTY.TITLE | translate }}"
     )
     p.title(translate="ISSUES.TABLE.EMPTY.TITLE")
-    p(translate="ISSUES.TABLE.EMPTY.SUBTITLE")
+    a(
+        href=""
+        ng-click="ctrl.addNewIssue()"
+        tg-check-permission="add_issue"
+        title="{{ ISSUES.ACTION_NEW_ISSUE | translate }}"
+        translate="ISSUES.TABLE.EMPTY.SUBTITLE"
+    )
diff --git a/app/partials/includes/modules/sprints.jade b/app/partials/includes/modules/sprints.jade
index 3324f818..d333e52d 100644
--- a/app/partials/includes/modules/sprints.jade
+++ b/app/partials/includes/modules/sprints.jade
@@ -7,7 +7,7 @@ section.sprints
             )
             span(translate="BACKLOG.SPRINTS.TITLE")
         a.add-sprint(
-            href="" 
+            href=""
             title="{{ 'BACKLOG.SPRINTS.TITLE_ACTION_NEW_SPRINT' | translate}}"
             ng-click="ctrl.addNewSprint()"
             ng-if="totalMilestones"
@@ -15,7 +15,7 @@ section.sprints
         )
             include ../../../svg/add.svg
 
-    div.sprints-empty(ng-if="!totalMilestones")
+    div.sprints-empty(ng-if="totalMilestones === 0")
         img(
             src="/images/sprint-empty.png"
             alt="{{'BACKLOG.SPRINTS.EMPTY' | translate}}"
@@ -26,6 +26,7 @@ section.sprints
             ng-click="ctrl.addNewSprint()"
             title="{{'BACKLOG.SPRINTS.TITLE_ACTION_NEW_SPRINT' | translate}}"
             translate="BACKLOG.SPRINTS.TEXT_ACTION_NEW_SPRINT"
+            tg-check-permission="add_milestone"
         )
 
     div.sprint.sprint-open(ng-repeat="sprint in openSprints track by sprint.id",