diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index c33cfa67888cbe958fac58282f8d1c26d3a7fe7e..997ab6df00fdf41990d2d98b3480a45246eb562d 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -18,7 +18,7 @@ he:
       invalid: "×”×¡×¡×ž×” ××• ×”×“×•××´×œ ×©×’×•×™×™×."
       invalid_token: "××¡×™×ž×•×Ÿ ×”××™×ž×•×ª ×©×’×•×™."
       timeout: "×”×”×¤×¢×œ×” ×©×œ×š ×¤×’×”, × × ×œ×”×™×›× ×¡ ×©×•×‘ ×›×“×™ ×œ×”×ž×©×™×š."
-      inactive: "×—×©×‘×•× ×š ×œ× ×”×•×¤×¢×œ ×¢×“×™×Ÿ."
+      inactive: "×—×©×‘×•× ×š ×œ× ×”×•×¤×¢×œ ×¢×“×™×™×Ÿ."
     sessions:
       signed_in: "× ×›× ×¡×ª ×‘×”×¦×œ×—×”."
       signed_out: "×™×¦××ª ×‘×”×¦×œ×—×”."
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 47f2a52c2946db5df32ded67e9c723642e5b8073..1105a3bcb0253785b765c402f5c173d46c04a667 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -86,7 +86,7 @@ he:
           add_a_new_aspect: "×”×•×¡×¤×ª ×”×™×‘×˜ ×—×“×©"
           create: "×™×¦×™××”"
       create:
-          success: "×™×© ×œ×œ×—×•×¥ ×¢×œ ×¡×ž×œ ×”×¤×œ×•×¡ ×©×ž×™×ž×™×Ÿ ×›×“×™ ×œ×•×ž×¨ ×œ×“×™××¡×¤×•×¨×” ×ž×™ ×™×¢×•×œ ×œ×¦×¤×•×ª ×‘×”×™×‘×˜ ×”×—×“×© ×©×œ×š."
+          success: "×™×© ×œ×œ×—×•×¥ ×¢×œ ×¡×ž×œ ×”×¤×œ×•×¡ ×©×ž×™×ž×™×Ÿ ×›×“×™ ×œ×•×ž×¨ ×œ×“×™××¡×¤×•×¨×” ×ž×™ ×™×›×•×œ ×œ×¦×¤×•×ª ×‘×”×™×‘×˜ ×”×—×“×© ×©×œ×š."
       destroy:
           success: "%{name} ×”×•×¡×¨ ×‘×”×¦×œ×—×”."
       update:
@@ -99,7 +99,7 @@ he:
           success: "×›×¢×ª ×™×•×¤×™×¢ ×‘×¤× ×™ ×”×—×‘×¨×™× ×©×œ×š ×”×™×‘×˜ ××—×¨ ×©×œ×š."
       helper:
           remove: "×”×¡×¨×”"
-          aspect_not_empty: "×”×”×™×¡×˜ ××™× ×• ×¨×™×§"
+          aspect_not_empty: "×”×”×™×‘×˜ ××™× ×• ×¨×™×§"
   users:
       edit:
           editing_profile: "×¢×¨×™×›×ª ×”×¤×¨×•×¤×™×œ"
@@ -134,13 +134,13 @@ he:
           delete_photo: "×ž×—×™×§×ª ×ª×ž×•× ×”"
       photo:
           show_comments: "×”×¦×’×ª ×”×¢×¨×•×ª"
-          posted_a_new_photo_to: "×¤×•×¨×¡×ž×” ×ª×ž×•× ×” ×—×“×©×” ××œ"
+          posted_a_new_photo_to: "×¤×•×¨×¡×ž×” ×ª×ž×•× ×” ×—×“×©×” ×‘××œ×‘×•×"
       new:
           new_photo: "×ª×ž×•× ×” ×—×“×©×”"
           back_to_list: "×—×–×¨×” ×œ×¨×©×™×ž×”"
           post_it: "×¤×¨×¡×•×!"
       create:
-          runtime_error: "×”×¢×œ××ª ×”×ª×ž×•× ×” × ×›×©×œ×”.  ×”×× ×”×—×’×•×¨×” ×©×œ×š ×ž×”×•×“×§×ª?"
+          runtime_error: "×”×¢×œ××ª ×”×ª×ž×•× ×” × ×›×©×œ×”.  ×”×™×“×§×ª ××ª ×”×—×’×•×¨×”?"
           integrity_error: "×”×¢×œ××ª ×”×ª×ž×•× ×” × ×›×©×œ×”.  ×”×× ×–×• ×‘××ž×ª ×”×™×™×ª×” ×ª×ž×•× ×”?"
           type_error: "×”×¢×œ××ª ×”×ª×ž×•× ×” × ×›×©×œ×”.  ×”×× ×‘××ž×ª × ×•×¡×¤×” ×ª×ž×•× ×”?"
       update:
@@ -155,7 +155,7 @@ he:
           success: "×”×¦×˜×¨×¤×ª ×œ×“×™××¡×¤×•×¨×”!"
   status_messages:
       new_status_message:
-          tell_me_something_good: "×‘× ×œ×™ ×œ×©×ž×•×¢ ×¡×™×¤×•×¨ ×˜×•×‘"
+          tell_me_something_good: "×‘× ×œ×™ ×œ×©×ž×•×¢ ×¡×™×¤×•×¨ × ×—×ž×“"
           oh_yeah: "××—×œ×”!"
       status_message:
           show_comments: "×”×¦×’×ª ×”×¢×¨×•×ª"
@@ -165,7 +165,7 @@ he:
           status_message: "×”×•×“×¢×ª ×ž×¦×‘"
           comments: "×”×¢×¨×•×ª"
           are_you_sure: "×‘×‘×˜×—×”?"
-          destroy: "×”×¨×™×‘×”"
+          destroy: "×”×¨×™×¡×”"
           view_all: "×¦×¤×™×™×” ×‘×›×•×œ"
           message: "×”×•×“×¢×”"
           owner: "×‘×¢×œ×™×"
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 7d072bdd571c2a2d0ad38229527678837609318d..d21b1d57c28ce905b74e13f63efaf5103a853bfe 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -12,12 +12,16 @@ describe User do
       user = Factory.build(:user, :username => "ALLUPPERCASE")
       user.valid?
       user.username.should == "alluppercase"
+
+      user = Factory.build(:user, :username => "someUPPERCASE")
+      user.valid?
+      user.username.should == "someuppercase"
     end
   end
 
   describe '#diaspora_handle' do
     it 'uses the pod config url to set the diaspora_handle' do
-      user.diaspora_handle.should == user.username + "@example.org"
+      user.diaspora_handle.should == user.username + "@" + APP_CONFIG[:terse_pod_url]
     end
   end