diff --git a/core/modules/poll/lib/Drupal/poll/PollFormController.php b/core/modules/poll/lib/Drupal/poll/PollFormController.php
index 7a53772..0ab5a2f 100644
--- a/core/modules/poll/lib/Drupal/poll/PollFormController.php
+++ b/core/modules/poll/lib/Drupal/poll/PollFormController.php
@@ -14,5 +14,5 @@ use Drupal\node\NodeFormController;
  * Form controller for the node edit forms.
  */
 class PollFormController extends NodeFormController {
-  // @todo Remove hook_form() and mmove form additions here.
+  // @todo Remove hook_form() and move form additions here.
 }
diff --git a/core/modules/user/lib/Drupal/user/ProfileFormController.php b/core/modules/user/lib/Drupal/user/ProfileFormController.php
index 3b68090..542e411 100644
--- a/core/modules/user/lib/Drupal/user/ProfileFormController.php
+++ b/core/modules/user/lib/Drupal/user/ProfileFormController.php
@@ -42,7 +42,7 @@ class ProfileFormController extends EntityFormController {
       '#type' => 'submit',
       '#value' => t('Cancel account'),
       '#submit' => array('user_edit_cancel_submit'),
-      '#access' => $account->uid > 1 && (($account->uid == $user->uid && user_access('cancel account')) || user_access('administer users')),
+      '#access' => $account->uid > 1 && (($account->uid == $GLOBALS['user']->uid && user_access('cancel account')) || user_access('administer users')),
     );
 
     return $element;