Edinburgh have confirmed that Jason Tovey, who joined the club on loan in March until the end of the season, has now signed until May 2018.
Tovey quickly became a popular figure at the Scottish club, taking home the supporters' player of the match trophy in addition to his PRO12 man-of-the-match medal on his debut for the capital side.
He has subsequently been rewarded for his performances and puts pen to paper on a two-year deal.
"Having the opportunity to come up to Edinburgh and play some rugby was definitely the right move for me and I'm loving it here," he said.
"I couldn't have asked for anything more from the boys over the last six weeks, it's great being out on the field with them and I'm enjoying my rugby again.
With a gamut of scores to his name – 32 points in his four matches for the club – Tovey just needs a drop goal to complete his cv: "I'm sure there'll be some drop goals to come next season!.
"It was good to score my first Edinburgh try the other week, though, and every point helps."
Tovey added: "I enjoy speaking to supporters after the game, it's always nice to get involved with them.
"We're moving ground in January to Myreside, looking at what's best for the club and for our supporters. Being at a smaller ground will help create a better atmosphere which will be huge for the boys."
Head coach Alan Solomons said: "It is terrific news for the club that Jason has committed to us.
"He is a quality fly-half and an excellent goal kicker, who has added huge value over the past month or so.
"He is also a first class bloke who has fitted in extremely well to the squad.
"I believe he will make a huge contribution next season and look forward to working with him."