Melee attacks generally will turn off /follow from my experiences, so that may be the issue. Simply make a /follow macro and mash it after combat, and all should be right in the world.