diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php
index 2f346f0513..b4975c4ce6 100644
--- a/phpBB/includes/sessions.php
+++ b/phpBB/includes/sessions.php
@@ -512,7 +512,7 @@ function session_reset_keys($user_id, $user_ip)
 	}
 
 	$where_sql = 'session_user_id = ' . (int) $user_id;
-	$where_sql .= ($user_id == $userdata['user_id']) ? "' AND session_id <> '" . $userdata['session_id'] . "'" : '';
+	$where_sql .= ($user_id == $userdata['user_id']) ? " AND session_id <> '" . $userdata['session_id'] . "'" : '';
 	$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
 		WHERE $where_sql";
 	if ( !$db->sql_query($sql) )
diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php
index 6197a7326e..56b789e2db 100644
--- a/phpBB/includes/usercp_register.php
+++ b/phpBB/includes/usercp_register.php
@@ -771,6 +771,7 @@ if ( $error )
 	//
 	$username = stripslashes($username);
 	$email = stripslashes($email);
+	$cur_password = '';
 	$new_password = '';
 	$password_confirm = '';
 
@@ -795,6 +796,7 @@ else if ( $mode == 'editprofile' && !isset($HTTP_POST_VARS['avatargallery']) &&
 	$user_id = $userdata['user_id'];
 	$username = $userdata['username'];
 	$email = $userdata['user_email'];
+	$cur_password = '';
 	$new_password = '';
 	$password_confirm = '';