How to change avatar when JFBConnect integration is switched on..

Hi,

I use JFBConnect to enable users to login using Facebook - but this is optional... They can also use manual registration.

I like the fact that users Facebook profile pictures are shown as their avatars when they used Facebook to log in.. But with the JFBConnect integration for avatars turned on there are two problems:
1) Users who did not log in with Facebook cannot set their avatars.
2) Users who did log in with Facebook but want to use a different profile picture, cannot change their avatars...

Please assist.

Thank yoU!