FIX: conflict in My Account view. Thanks to thierry for making the code more efficient