diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index f4a5e16ca..219e5d06d 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -23,7 +23,7 @@ class Registrar < ActiveRecord::Base
   end
 
   def address
-    [street, city, state, city].reject(&:empty?).compact.join(', ')
+    [street, city, state, zip].reject(&:empty?).compact.join(', ')
   end
 
   def to_s
diff --git a/spec/models/registrar_spec.rb b/spec/models/registrar_spec.rb
index 59418497c..2b17bb04a 100644
--- a/spec/models/registrar_spec.rb
+++ b/spec/models/registrar_spec.rb
@@ -55,5 +55,9 @@ describe Registrar do
         @registrar.versions.size.should == 1
       end
     end
+
+    fit 'should return full address' do
+      @registrar.address.should == 'Street 999, Town, County, Postal'
+    end
   end
 end