Fix old password requirement and SQL error

qa-include/db/users.php

@@ -47,7 +47,7 @@
 		if(!qa_php_version_below('5.3.7')){
 			qa_db_query_sub(
 				'INSERT INTO ^users (created, createip, email, passhash, level, handle, loggedin, loginip) '.
-				'VALUES (NOW(), COALESCE(INET_ATON($), 0), $, $, $, #, $, NOW(), COALESCE(INET_ATON($), 0))',
+				'VALUES (NOW(), COALESCE(INET_ATON($), 0), $, $, #, $, NOW(), COALESCE(INET_ATON($), 0))',
 				$ip, $email, isset($password) ? password_hash($password, PASSWORD_BCRYPT) : null, (int)$level, $handle, $ip
 			);
 		} else {

qa-include/pages/account.php

@@ -476,7 +476,7 @@
 		),
 	);
 
-	if (!$haspassword) {
+	if (!$haspassword && !$haspasswordold) {
 		$qa_content['form_password']['fields']['old']['type']='static';
 		$qa_content['form_password']['fields']['old']['value']=qa_lang_html('users/password_none');
 	}