fixing deprecated dynamic call
fixing password current entry
merging companies