2 files changed, 18 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 1e6a3a088..1b023acc3 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -874,6 +874,16 @@ sub save_user_and_report : Private {
 
     # Save or update the user if appropriate
     if ( !$report->user->in_storage ) {
+        # User does not exist.
+        # Store changes in token for when token is validated.
+        $c->stash->{token_data} = {
+            name => $report->user->name,
+            phone => $report->user->phone,
+            password => $report->user->password,
+        };
+        $report->user->name( undef );
+        $report->user->phone( undef );
+        $report->user->password( '', 1 );
         $report->user->insert();
     }
     elsif ( $c->user && $report->user->id == $c->user->id ) {
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index add9d1371..c67ca4d1f 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -255,6 +255,14 @@ sub save_update : Private {
     my $update = $c->stash->{update};
 
     if ( !$update->user->in_storage ) {
+        # User does not exist.
+        # Store changes in token for when token is validated.
+        $c->stash->{token_data} = {
+            name => $update->user->name,
+            password => $update->user->password,
+        };
+        $update->user->name( undef );
+        $update->user->password( '', 1 );
         $update->user->insert;
     }
     elsif ( $c->user && $c->user->id == $update->user->id ) {