diff --git a/core/modules/contact/lib/Drupal/contact/MessageFormController.php b/core/modules/contact/lib/Drupal/contact/MessageFormController.php
index 073e814..5df3502 100644
--- a/core/modules/contact/lib/Drupal/contact/MessageFormController.php
+++ b/core/modules/contact/lib/Drupal/contact/MessageFormController.php
@@ -63,7 +63,7 @@ public function form(array $form, array &$form_state) {
 
     // The user contact form only has a recipient, not a category.
     // @todo Convert user contact form into a locked contact category.
-    if ($message->recipient instanceof User) {
+    if ($message->recipient instanceof UserInterface) {
       $form['recipient'] = array(
         '#type' => 'item',
         '#title' => t('To'),
@@ -167,7 +167,7 @@ public function save(array $form, array &$form_state) {
       $to = implode(', ', $category->recipients);
       $recipient_langcode = language_default()->langcode;
     }
-    elseif ($message->recipient && $message->recipient->getNGEntity() instanceof User) {
+    elseif ($message->recipient && $message->recipient instanceof UserInterface) {
       // Send to the user in the user's preferred language.
       $to = $message->recipient->mail;
       $recipient_langcode = user_preferred_langcode($message->recipient);
@@ -211,7 +211,7 @@ public function save(array $form, array &$form_state) {
 
     // To avoid false error messages caused by flood control, redirect away from
     // the contact form; either to the contacted user account or the front page.
-    if ($message->recipient instanceof User && user_access('access user profiles')) {
+    if ($message->recipient instanceof UserInterface && user_access('access user profiles')) {
       $uri = $message->recipient->uri();
       $form_state['redirect'] = array($uri['path'], $uri['options']);
     }
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index af1330e..04c454a 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -332,7 +332,7 @@ function forum_node_presave(EntityInterface $node) {
     $node->icon = !empty($node->icon) ? $node->icon : '';
     reset($node->taxonomy_forums);
     $langcode = key($node->taxonomy_forums);
-    if (!empty($node->taxonomy_forums[$langcode])) {
+    if (!empty($node->taxonomy_forums[$langcode]) && !$node->isNew()) {
       $node->forum_tid = $node->taxonomy_forums[$langcode][0]['tid'];
       $old_tid = db_query_range("SELECT f.tid FROM {forum} f INNER JOIN {node} n ON f.vid = n.vid WHERE n.nid = :nid ORDER BY f.vid DESC", 0, 1, array(':nid' => $node->nid))->fetchField();
       if ($old_tid && isset($node->forum_tid) && ($node->forum_tid != $old_tid) && !empty($node->shadow)) {