Searching public member trees on Ancestry I discovered one member had John's address as 31 Primrose Street and Margaret's as 14 Gilman Street Edinburgh.
Both were born and resided in Elgin to just before the marriage and I assumed Margaret's address was in Elgin but looking at it now I think it's Edin, abbreviated for Edinburgh.
As usual I want to say thanks to all for the efforts - much appreciated as always!
James.