diff --git a/ChangeLog b/ChangeLog
index 86f3497b8..a4acaa7c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* org.el (org-agenda-get-deadlines): Make sure priorities increase
 	as the due date approaches and is passed.
+	(org-remember-apply-template): Fixed problem with tags that
+	contain "_" or "@".
 
 2008-02-01  Carsten Dominik  <dominik@science.uva.nl>
 
diff --git a/org.el b/org.el
index 35de41e84..33ddfc204 100644
--- a/org.el
+++ b/org.el
@@ -13522,7 +13522,7 @@ to be run from that hook to function properly."
 			 'org-tags-completion-function nil nil nil
 			 'org-tags-history)))
 	      (setq ins (mapconcat 'identity
-				  (org-split-string ins (org-re "[^[:alnum:]]+"))
+				  (org-split-string ins (org-re "[^[:alnum:]_@]+"))
 				  ":"))
 	      (when (string-match "\\S-" ins)
 		(or (equal (char-before) ?:) (insert ":"))