diff -urN vyatta.orig/share/perl5/Vyatta/PPTPConfig.pm vyatta/share/perl5/Vyatta/PPTPConfig.pm
--- vyatta.orig/share/perl5/Vyatta/PPTPConfig.pm        2010-07-24 02:42:01.000000000 +1000
+++ vyatta/share/perl5/Vyatta/PPTPConfig.pm     2010-11-19 13:52:08.000000000 +1000
@@ -54,7 +54,10 @@
   foreach my $user (@users) {
     my $plvl = "authentication local-users username $user password";
     my $pass = $config->returnValue("$plvl");
-    $self->{_auth_local} = [ @{$self->{_auth_local}}, $user, $pass ];
+    my $iplvl = "authentication local-users username $user address";
+    my $ipaddr = $config->returnValue("$iplvl");
+    $ipaddr = "*" if (!defined($ipaddr));
+    $self->{_auth_local} = [ @{$self->{_auth_local}}, $user, $pass , $ipaddr ];
   }
   
   my @rservers = $config->listNodes('authentication radius-server');
@@ -203,7 +206,8 @@
     while (scalar(@users) > 0) {
       my $user = shift @users;
       my $pass = shift @users;
-      $str .= ("\n$user\t" . 'pptpd' . "\t\"$pass\"\t" . '*');
+      my $ipaddr = shift @users;
+      $str .= ("\n$user\t" . 'pptpd' . "\t\"$pass\"\t" . $ipaddr);
     }
   }
   $str .= "\n$cfg_delim_end\n";
diff -urN vyatta.orig/share/vyatta-cfg/templates/vpn/pptp/remote-access/authentication/local-users/username/node.tag/address/node.def vyatta/share/vyatta-cfg/templates/vpn/pptp/remote-access/authentication/local-users/username/node.tag/address/node.def
--- vyatta.orig/share/vyatta-cfg/templates/vpn/pptp/remote-access/authentication/local-users/username/node.tag/address/node.def 1970-01-01 10:00:00.000000000 +1000
+++ vyatta/share/vyatta-cfg/templates/vpn/pptp/remote-access/authentication/local-users/username/node.tag/address/node.def  2010-11-19 13:50:31.000000000 +1000
@@ -0,0 +1,2 @@
+help: IP Address assigned to user
+type: ipv4