Merge pull request #695 from arnaudbey/master

pimp my ride
change form saving logic.