If you set the cup on the pedestal in Gula's dig, that probably screwed up the quest. Doing that will break the curse on Najaad, which pre-empts both his quests, really.
It does. You have to give Najaad the drink while he's still in troll form to get the
Bartender quest award. You'll still get the award for breaking the curse.
