diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 4647871337aee03bf7c1c9786a8b9e770afcb605..f283a4b3598f66032eebd593426fa6c1d5672f21 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -99,15 +99,13 @@ describe User do
         duplicate_user.should_not be_valid
       end
 
-      it "keeps the original case" do
-        pending "do we want this?"
+      it "downcases username" do
         user = Factory.build(:user, :username => "WeIrDcAsE")
         user.should be_valid
-        user.username.should == "WeIrDcAsE"
+        user.username.should == "weirdcase"
       end
 
       it "fails if the requested username is only different in case from an existing username" do
-        pending "do we want this?"
         duplicate_user = Factory.build(:user, :username => user.username.upcase)
         duplicate_user.should_not be_valid
       end
@@ -128,6 +126,11 @@ describe User do
         user.should_not be_valid
       end
 
+      it 'should not contain periods' do
+        user = Factory.build(:user, :username => "kittens;")
+        user.should_not be_valid
+      end
+
       it "can be 32 characters long" do
         user = Factory.build(:user, :username => "hexagoooooooooooooooooooooooooon")
         user.should be_valid