diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index 4ce06877fe..998623869e 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -208,6 +208,10 @@ helpers do
                 env['rack.session.options'][:expire_after] = 30*60*60*24-1
             end
 
+            zpool = ZonePoolJSON.new(client)
+            zpool.info
+            zpool.each{|z| session[:zone_name] = z.name if z.id == 0}
+
             return [204, ""]
         end
     end