diff --git a/app/Models/Album.php b/app/Models/Album.php
index 4fd2f7dd..e3000e17 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -212,6 +212,7 @@ class Album extends Model implements Searchable
             'user' => [
                 'id' => (int) $album->user->id,
                 'name' => $album->user->display_name,
+                'slug' => $album->user->slug,
                 'url' => $album->user->url,
             ],
             'user_data' => $userData,
diff --git a/public/templates/account/albums.html b/public/templates/account/albums.html
index 778976ee..8a2d90a0 100644
--- a/public/templates/account/albums.html
+++ b/public/templates/account/albums.html
@@ -11,7 +11,7 @@
         <div class="list">
             <ul class="account-albums-listing stretch-to-bottom">
                 <li ng-repeat="album in albums track by album.id" ng-class="{selected: album.id == data.selectedAlbum.id}">
-                    <a ui-sref=".edit({album_id: {{::album.id}}})">
+                    <a ui-sref=".edit(::{album_id: album.id})">
                         <img pfm-src-loader="album.covers.normal" pfm-src-size="normal" class="image" />
                         <span class="title">{{album.title}}</span>
                         <span class="published">{{album.created_at | date:'MM/dd/yyyy'}}</span>
diff --git a/public/templates/account/tracks.html b/public/templates/account/tracks.html
index 28cbd00d..f474c2bf 100644
--- a/public/templates/account/tracks.html
+++ b/public/templates/account/tracks.html
@@ -2,7 +2,7 @@
     <div class="list">
         <ul class="account-tracks-listing stretch-to-bottom">
             <li ng-repeat="track in tracks track by track.id" ng-class="{selected: track.id == data.selectedTrack.id, 'is-not-published': !track.is_published}">
-                <a ui-sref=".edit({track_id: {{::track.id}}})" ng-click="selectTrack(track)">
+                <a ui-sref=".edit(::{track_id: track.id})" ng-click="selectTrack(track)">
                     <img class="image" ng-src="{{track.cover_url}}" />
                     <span class="title">{{track.title}}</span>
                     <span class="published">{{track.created_at | date:'MM/dd/yyyy'}}</span>
diff --git a/public/templates/albums/show.html b/public/templates/albums/show.html
index 2e41b3c5..6f655628 100644
--- a/public/templates/albums/show.html
+++ b/public/templates/albums/show.html
@@ -21,7 +21,7 @@
         </li>
         <li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share</a></li>
         <li><pfm-favourite-button resource="::album" type="album"></pfm-favourite-button></li>
-        <li ng-show="::album.permissions.edit"><a class="btn btn-small" ng-href="/account/albums/edit/{{::album.id}}">Edit</a></li>
+        <li ng-if="::album.permissions.edit"><a class="btn btn-small" ui-sref="content.artist.account.albums.edit(::{slug: album.user.slug, album_id: album.id})">Edit</a></li>
     </ul>
 
     <header>