I have edited
/etc/NetworkManager/system-connections/name_of_your_connection
by outcommenting the line with the mac-address:
[wifi]
#mac-address=xx:xx:xx:xx
Now the phone connects without re-entering the password.
Can you try, if that works for you, too?