diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm
index 0d12fb8..f1dc43e 100644
--- a/lib/Travelynx/Controller/Account.pm
+++ b/lib/Travelynx/Controller/Account.pm
@@ -1218,6 +1218,15 @@ sub confirm_mail {
 	my $id     = $self->current_user->{id};
 	my $token  = $self->stash('token');
 
+	# Some mail clients include the trailing ">" from the confirmation mail
+	# when opening/copying the confirmation link. A token will never contain
+	# this symbol, so remove it just in case.
+	$token =~ s{>}{};
+
+	# I did not yet find a mail client that also includes the trailing ",",
+	# but you never now...
+	$token =~ s{,}{};
+
 	if (
 		$self->users->change_mail_with_token(
 			uid   => $id,