Friction Stir Welding has seen a fast uptake in many industry segments. Mechanical properties superior to fusion welding, the ability to weld "unweldable" aluminium alloys and low distortion are often described as the main reasons for the fast industrial implementation of FSW. Most existing applications consist of long straight welding joints. Applications with complex weld geometries, however, are rarely produced by FSW. These geometries can induce thermal variations during the welding process, thus making it challenging to maintain a consistent weld quality. In-process adaptation of weld parameters to respond to geometrical variations and other environmental variants allow new design opportunities for FSW. Weld quality has been shown to be reliant on the welding temperature. However, the optimal methodology to control the temperature is still under development.The research work presented in this thesis focuses on some steps to take in order to reach the improvement of the FSW temperature controller, thus reach a better and consistent weld quality. In the present work different temperature methods were evaluated. Temperature measurements acquired by the tool-workpiece thermocouple (TWT) method were accurate and fast, and thereby enhanced suitable for the controller. Different environmental conditions influencing the material heat dissipation were imposed in order to verify the controller effect on the joint quality. In comparison with no controlled weld, the use of the controller enabled a fast optimization of welding parameters for the different conditions, leading to an improvement of the mechanical properties of the joint.For short weld lengths, such as stitch welds, the initial plunge and dwell stages occupy a large part of the total process time. In this work temperature control was applied during these stages. This approach makes the plunge and dwell stages more robust by preventing local material overheating, which could lead to a tool meltdown. The TWT method was demonstrated to allow a good process control during plunging and continuous welding. The approach proposed for control offers weld quality consistency and improvement. Also, it allows a reduction of the time required for the development of optimal parameters, providing a fast adaptation to disturbances during welding and, by decreasing the plunge time, provides a significant decrease on the process time for short welds.