diff --git a/app/controllers/account.coffee b/app/controllers/account.coffee
index a922a5a8..f1ddb699 100644
--- a/app/controllers/account.coffee
+++ b/app/controllers/account.coffee
@@ -29,6 +29,10 @@ Controller = Ember.Controller.extend
 
       @set('allHooks', hooks)
 
+  accountName: (->
+    @get('model.name') || @get('model.login')
+  ).property('model.name', 'model.login')
+
   hooks: (->
     @reloadHooks() unless hooks = @get('allHooks')
     @get('allHooks').filter (hook) -> hook.get('admin')
@@ -41,11 +45,11 @@ Controller = Ember.Controller.extend
 
   showPrivateReposHint: (->
     @config.show_repos_hint == 'private'
-  ) .property()
+  ).property()
 
   showPublicReposHint: (->
     @config.show_repos_hint == 'public'
-  ) .property()
+  ).property()
 
   billingUrl: (->
     id = if @get('model.type') == 'user' then 'user' else @get('model.login')
diff --git a/app/templates/account.hbs b/app/templates/account.hbs
index e535d52c..93a0d8f0 100644
--- a/app/templates/account.hbs
+++ b/app/templates/account.hbs
@@ -22,7 +22,7 @@
   {{/if}}
 
     <div class="profile-header">
-      <h1>{{user.name}}</h1>
+      <h1>{{accountName}}</h1>
     </div>
 
     {{#if user.isSyncing}}
diff --git a/app/templates/profile/repo.hbs b/app/templates/profile/repo.hbs
deleted file mode 100644
index 43d6cf6c..00000000
--- a/app/templates/profile/repo.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Settings: {{slug}}</h1>
-
-{{outlet}}
diff --git a/app/templates/profile/show.hbs b/app/templates/profile/show.hbs
deleted file mode 100644
index f1f831bf..00000000
--- a/app/templates/profile/show.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-{{!-- <article class="profile-main">
-  {{outlet}}
-</article>
- --}}
\ No newline at end of file
diff --git a/app/templates/profile/tabs.hbs b/app/templates/profile/tabs.hbs
deleted file mode 100644
index f7e232be..00000000
--- a/app/templates/profile/tabs.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-<ul class="tabs">
-  <li id="tab_hooks" class={{view.classHooks}}>
-    <h5>
-      {{#link-to "account" account}}Repositories{{/link-to}}
-    </h5>
-  </li>
-  {{#if view.displayUser}}
-    <li id="tab_user" class={{view.classUser}}>
-      <h5>
-        {{#link-to "accounts.info"}}Profile{{/link-to}}
-      </h5>
-    </li>
-  {{/if}}
-  {{#if config.billingEndpoint}}
-    <li id="tab_billing" class="right">
-      <h5>
-        <a href={{billingUrl}}>Billing</a>
-      </h5>
-    </li>
-  {{/if}}
-</ul>
diff --git a/app/templates/profile/tabs/user.hbs b/app/templates/profile/tabs/user.hbs
deleted file mode 100644
index b10cf139..00000000
--- a/app/templates/profile/tabs/user.hbs
+++ /dev/null
@@ -1,29 +0,0 @@
-{{!-- <img src={{view.gravatarUrl}}>
-
-<dl class="profile">
-  <div>
-    <dt>
-      GitHub
-    </dt>
-    <dd>
-      <a href={{urlGithub}}>{{user.login}}</a>
-    </dd>
-  </div>
-  <div>
-    <dt>
-      Email
-    </dt>
-    <dd>
-      {{user.email}}
-    </dd>
-  </div>
-  <div>
-    <dt>
-      Token
-    </dt>
-    <dd>
-      {{user.token}}
-    </dd>
-  </div>
-</dl>
- --}}