Merge pull request #936 from alphagov/fix-forgot-password-empty-user-issue

Fix exception raised when a pending user attempts to complete 'forgotten password' flow

app/notify_client/user_api_client.py

@@ -122,5 +122,8 @@ class UserApiClient(BaseAPIClient):
         return True
 
     def activate_user(self, user):
-        user.state = 'active'
-        return self.update_user(user)
+        if user.state == 'pending':
+            user.state = 'active'
+            return self.update_user(user)
+        else:
+            return user