I wanted to say

The stock price when he joined the company was $30.

Is this grammatically correct and does it sound natural? If not, is there a better way to say it?

I wanted to say

The stock price when he joined the company was $30.

Is this grammatically correct and does it sound natural? If not, is there a better way to say it?

Update: To clarify, what I really wanted to know is if when clauses can describe nouns. The previous example might be a bit ambiguous. Another example:

I wanted to know the stock price when he joined the company.