diff --git a/PBot/ChanOps.pm b/PBot/ChanOps.pm
index 48f08421..1ec02f66 100644
--- a/PBot/ChanOps.pm
+++ b/PBot/ChanOps.pm
@@ -116,6 +116,7 @@ sub ban_user_timed {
   my $self = shift;
   my ($mask, $channel, $length) = @_;
 
+  $mask .= '!*@*' if $mask !~ m/[!@]/;
   $self->ban_user($mask, $channel);
   $self->{unban_timeout}->hash->{$channel}->{$mask}{timeout} = gettimeofday + $length;
   $self->{unban_timeout}->save;