diff --git a/smradius/modules/userdb/mod_userdb_sql.pm b/smradius/modules/userdb/mod_userdb_sql.pm
index fc4dfba0051c2475c52a8e85a03a726012ee51ac..fc6956c4b79c4773802a9e8a092de766a429c974 100644
--- a/smradius/modules/userdb/mod_userdb_sql.pm
+++ b/smradius/modules/userdb/mod_userdb_sql.pm
@@ -90,7 +90,7 @@ sub init
 		SELECT 
 			Name, Operator, Value
 		FROM 
-			@TP@users_attributes 
+			@TP@user_attributes 
 		WHERE 
 			UserID = %{user.ID}
 	';
@@ -174,6 +174,8 @@ sub get
 	$template->{'user'}->{'Username'} = $user->{'Username'};
 	$template->{'user'}->{'ID'} = $user->{'_UserDB_Data'}->{'id'};
 
+	# Attributes to return
+	my %attributes = ();
 
 	# Replace template entries
 	my @dbDoParams = templateReplace($config->{'userdb_get_group_attributes_query'},$template);
@@ -186,10 +188,10 @@ sub get
 	
 	# Loop with group attributes
 	while (my $row = $sth->fetchrow_hashref()) {
-		addAttribute($server,$user->{'Attributes'},$row);
+		addAttribute($server,\%attributes,hashifyLCtoMC($row,qw(Name Operator Value)));
 	}
 
-	$sth->DBFreeRes();
+	DBFreeRes($sth);
 
 
 
@@ -204,13 +206,12 @@ sub get
 	
 	# Loop with group attributes
 	while (my $row = $sth->fetchrow_hashref()) {
-		addAttribute($server,$user->{'Attributes'},$row);
+		addAttribute($server,\%attributes,hashifyLCtoMC($row,qw(Name Operator Value)));
 	}
 
-	$sth->DBFreeRes();
-
+	DBFreeRes($sth);
 
-#	return $userDetails;
+	return \%attributes;
 }