diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index ea046d7aa..076893404 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -12,7 +12,7 @@
   = render "shared/aspect_friends"
 
 .span-15.last
-  = render "shared/publisher", :type => :album, :aspect => @aspect.id
+  = render "shared/publisher", :type => :album, :aspect => @aspect
 
   %div
     - for album in @albums
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 832c07916..56ac9e440 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -53,7 +53,7 @@
         = album.label :name
         = album.text_field :name
 
-      = album.hidden_field :to, :value => aspect
+      = album.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id)
 
       .options_and_submit
         = album.submit "Create", :class => 'button'