Database admin few bug fix