diff --git a/Library/Homebrew/cask/utils.rb b/Library/Homebrew/cask/utils.rb
index c7019a1c50..976ec7f22f 100644
--- a/Library/Homebrew/cask/utils.rb
+++ b/Library/Homebrew/cask/utils.rb
@@ -111,9 +111,8 @@ module Cask
     def self.token_from(name)
       name.downcase
           .gsub("+", "-plus-")
-          .gsub("@", "-at-")
           .gsub(/[ _·•]/, "-")
-          .gsub(/[^\w-]/, "")
+          .gsub(/[^\w@-]/, "")
           .gsub(/--+/, "-")
           .delete_prefix("-")
           .delete_suffix("-")