diff --git a/app/models/message_template/custom_tip.rb b/app/models/message_template/custom_tip.rb
index fdb68155c..b0f628d6e 100644
--- a/app/models/message_template/custom_tip.rb
+++ b/app/models/message_template/custom_tip.rb
@@ -61,6 +61,7 @@ class MessageTemplate::CustomTip < MessageTemplate
     end
     title.gsub!('{platform}', PLATFORM)
     content.gsub!('{platform}', PLATFORM)
+    content.gsub!('{baseurl}', base_url)
 
     return title, content
   rescue => e
diff --git a/app/models/user.rb b/app/models/user.rb
index bf764c148..a21e41929 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -181,7 +181,7 @@ class User < Owner
   scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
   scope :like, lambda { |keywords|
     sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search"
-    where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
+    where(sql, :search => "%#{keywords.strip}%") unless keywords.blank?
   }
 
   scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname, :gitea_uid, :type)}