First start at retiring Affiliate in favour of RTM

application/classes/Controller/User/Welcome.php

@@ -9,17 +9,16 @@
  * @copyright  (c) 2009-2013 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Controller_User_Welcome extends Controller_TemplateDefault_User {
+class Controller_User_Welcome extends Controller_Welcome {
+	protected $auth_required = TRUE;
 	protected $secure_actions = array(
-		'index'=>FALSE,
-        );
+		'index'=>TRUE,
+	);
 
 	public function action_index() {
-		$ao = ORM::factory('Account',Auth::instance()->get_user()->id);
-
 		Block::add(array(
-			'title'=>sprintf('%s: %s %s',$ao->accnum(),$ao->first_name,$ao->last_name),
-			'body'=>'Please select from the tree on the left',
+			'title'=>sprintf('%s: %s',$this->ao->accnum(),$this->ao->name(TRUE)),
+			'body'=>View::factory('welcome/user'),
 		));
 	}
 }