diff --git a/modules/exploits/multi/http/drupal_drupageddon.rb b/modules/exploits/multi/http/drupal_drupageddon.rb
index 292cabf871..3dfef93d5a 100644
--- a/modules/exploits/multi/http/drupal_drupageddon.rb
+++ b/modules/exploits/multi/http/drupal_drupageddon.rb
@@ -126,8 +126,8 @@ class Metasploit3 < Msf::Exploit::Remote
   end
 
   def extract_form_ids(content)
-    form_build_id = $1 if content =~ /name="form_build_id" value="(.+)" \/>/
-    form_token = $1 if content =~ /name="form_token" value="(.+)" \/>/
+    form_build_id = $1 if content =~ /name="form_build_id" value="(.+?)"/
+    form_token = $1 if content =~ /name="form_token" value="(.+?)"/
 
     vprint_debug("#{peer} - form_build_id: #{form_build_id}")
     vprint_debug("#{peer} - form_token: #{form_token}")