diff --git a/app/models/garden.rb b/app/models/garden.rb
index 784bf0aa4..1e2c7faa8 100644
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -6,7 +6,8 @@ class Garden < ActiveRecord::Base
   belongs_to :user
 
   def garden_slug
-    "#{user.username}-#{name}"
+    formatted_name = name.downcase.gsub(' ', '-')
+    "#{user.username}-#{formatted_name}"
   end
 
   def owner
diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb
index 53a39892b..81c95fe4c 100644
--- a/spec/models/garden_spec.rb
+++ b/spec/models/garden_spec.rb
@@ -2,14 +2,12 @@ require 'spec_helper'
 
 describe Garden do
   before :each do
-    @user = mock_model(User)
-    @user.stub!(:username).and_return("test1")
-    @garden = Garden.new(:name => "my garden")
-    @garden.user = @user
+    @user   = FactoryGirl.create(:user)
+    @garden = FactoryGirl.create(:garden, :user => @user)
   end
 
   it "should have a slug" do
-    @garden.garden_slug.should == "test1-my garden"
+    @garden.garden_slug.should == "user1-my-garden"
   end
 
   it "should have an owner" do