update to solve password and post data issues

Conflicts:
	index.php