diff --git a/TODO.md b/TODO.md
index f886240..57f97e5 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,9 +2,11 @@
 
 ##Release: MVP
 
+- [ ] show chart page
+
 ###GitHub
 
-- [ ] progress needs to be calculated based on strategy even on homepage, then sort the milestones based on priority
+- [ ] sort milestones on index and project page based on priority (most delayed first)
 
 ###Notifications
 
@@ -45,6 +47,7 @@
 - [ ] switch off `user-select` on buttons
 - [ ] make async pages transition so that there is no "jumping" on the page
 - [ ] index page alert tooltip
+- [ ] app icon like http://thenounproject.com/term/fire/50966/
 
 ###Misc
 
diff --git a/public/js/app.bundle.js b/public/js/app.bundle.js
index 97b3322..058855b 100644
--- a/public/js/app.bundle.js
+++ b/public/js/app.bundle.js
@@ -39146,10 +39146,12 @@ Router.prototype.mount = function(routes, path) {
           this.set('client', client = new Firebase("https://" + config.data.firebase + ".firebaseio.com"));
           return this.auth = new FirebaseSimpleLogin(client, function(err, obj) {
             user.set('loaded', true);
-            if (err || !obj) {
+            if (err) {
               throw err;
             }
-            return user.set(obj);
+            if (obj) {
+              return user.set(obj);
+            }
           });
         }
       });
diff --git a/public/js/app.js b/public/js/app.js
index 95c274c..7e89876 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -98,10 +98,12 @@
           this.set('client', client = new Firebase("https://" + config.data.firebase + ".firebaseio.com"));
           return this.auth = new FirebaseSimpleLogin(client, function(err, obj) {
             user.set('loaded', true);
-            if (err || !obj) {
+            if (err) {
               throw err;
             }
-            return user.set(obj);
+            if (obj) {
+              return user.set(obj);
+            }
           });
         }
       });
diff --git a/src/models/firebase.coffee b/src/models/firebase.coffee
index a44a2aa..11b15a8 100644
--- a/src/models/firebase.coffee
+++ b/src/models/firebase.coffee
@@ -29,7 +29,7 @@ module.exports = new Model
     @auth = new FirebaseSimpleLogin client, (err, obj) =>
       user.set 'loaded', yes
 
-      throw err if err or not obj
+      throw err if err
 
       # Save user.
-      user.set obj
\ No newline at end of file
+      user.set obj if obj
\ No newline at end of file