Was the old man with Nagi during and after the credits Shiotsuki?

I kind of got the feeling that Nagi and Sammy both like Rikuo from that scene in the cafe where they blushed, so I'm assuming that Nagi's relationship with the old cyborg is more of a parental thing than a romantic one.

This thing needs a sequel. The movie subtitle says that it is just the first season. I hope that means what it should.