Fixed Entity relationships
loginadd merge