diff --git a/app/models/user.rb b/app/models/user.rb
index 3080851548e..f1f68d5f424 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -198,7 +198,7 @@ class User < ActiveRecord::Base
     end
 
     def by_username_or_id(name_or_id)
-      where('username = ? OR id = ?', name_or_id, name_or_id).first
+      where('users.username = ? OR users.id = ?', name_or_id, name_or_id.to_i).first
     end
 
     def build_user(attrs = {}, options= {})