diff --git a/app/models/account.rb b/app/models/account.rb
index 950c0a124..c29f61005 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -4,7 +4,7 @@ class Account < ApplicationRecord
   has_many_attached :uploads
 
   def slug
-    "/#{tenant_id}"
+    "/#{tenant}"
   end
 
   def setup_basic_template
diff --git a/bin/dev b/bin/dev
index cc4e4ce62..1c77800e3 100755
--- a/bin/dev
+++ b/bin/dev
@@ -1,12 +1,10 @@
 #!/usr/bin/env sh
 
-echo "Login with david@37signals.com / secret123456 to:"
 bin/rails runner - <<EOF
+  puts "Login with david@37signals.com / secret123456 to:"
   ApplicationRecord.with_each_tenant do |tenant|
     next unless tenant =~ /\A\d+\z/
-    if Account.sole.tenant_id
-      puts "  - #{Account.sole.name}: http://fizzy.localhost:3006/#{Account.sole.tenant_id}"
-    end
+    puts "  - #{Account.sole.name}: http://fizzy.localhost:3006#{Account.sole.slug}"
   end
 EOF
 
diff --git a/test/models/account_test.rb b/test/models/account_test.rb
index dbede16f2..78554b997 100644
--- a/test/models/account_test.rb
+++ b/test/models/account_test.rb
@@ -3,6 +3,6 @@ require "test_helper"
 class AccountTest < ActiveSupport::TestCase
   test "slug" do
     account = Account.sole
-    assert_equal "/#{account.tenant_id}", account.slug
+    assert_equal "/#{ApplicationRecord.current_tenant}", account.slug
   end
 end