diff --git a/app/generator.js b/app/generator.js
index 5bb5bc92d..cd5e5d1be 100644
--- a/app/generator.js
+++ b/app/generator.js
@@ -144,7 +144,9 @@ export default class Generator extends Base {
 
             this.scriptExt = answers.transpiler === 'ts' ? 'ts' : 'js';
             this.templateExt = answers.markup;
-            this.styleExt = answers.stylesheet === 'sass' ? 'scss' : answers.stylesheet;
+
+            var styleExt = {sass: 'scss', stylus: 'styl'}[answers.stylesheet];
+            this.styleExt = styleExt ? styleExt : answers.stylesheet;
 
             cb();
           }.bind(this));
diff --git a/app/templates/client/app/app(stylus).styl b/app/templates/client/app/app(stylus).styl
index de156ca97..ffb293544 100644
--- a/app/templates/client/app/app(stylus).styl
+++ b/app/templates/client/app/app(stylus).styl
@@ -45,7 +45,6 @@
 <% } %>
 // Component styles are injected through grunt
 // injector
-@import "account/login/login"
 @import "admin/admin"
 @import "main/main"
 // endinjector