diff --git a/client/src/AccountScreen.js b/client/src/AccountScreen.js
index 0f34f10..b026264 100644
--- a/client/src/AccountScreen.js
+++ b/client/src/AccountScreen.js
@@ -4,9 +4,8 @@ import styles from './components/styles/AccountScreen.styles';
 import buttonStyles from './components/common/button';
 import { retrieveData, removeData } from './caching';
 
-
 export default function AccountScreen({ navigation }) {
-  const [usernameValid, setUsernameValid] = useState(null)
+  const [usernameValid, setUsernameValid] = useState(null);
 
   useEffect(() => {
     const fetchUsername = async () => {
@@ -17,8 +16,8 @@ export default function AccountScreen({ navigation }) {
         console.error('Error retrieving username:', error);
       }
     };
-  fetchUsername();
-},[]);
+    fetchUsername();
+  }, []);
 
   const logout = async () => {
     try {
diff --git a/client/src/DisplayRoute.js b/client/src/DisplayRoute.js
index c981418..c94d6ff 100644
--- a/client/src/DisplayRoute.js
+++ b/client/src/DisplayRoute.js
@@ -9,7 +9,6 @@ import displayRouteStyles from './components/styles/DisplayRoute.styles';
 
 import locationCircleIcon from './assets/location-circle.png';
 
-
 export default function DisplayRouteScreen({ navigation, route }) {
   // route is a prop passed by the navigator, hence why that is used instead of other variable names
   const { origin, destination, routeData, polylineCoordinates } = route.params;
diff --git a/client/src/FriendsScreen.js b/client/src/FriendsScreen.js
index 783e71b..ed947af 100644
--- a/client/src/FriendsScreen.js
+++ b/client/src/FriendsScreen.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-use-before-define */
 import React, { useState, useEffect } from 'react';
 import {
   View,
@@ -10,20 +11,78 @@ import {
 } from 'react-native';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import styles from './components/styles/FriendsScreen.styles';
+import { retrieveData } from './caching';
+
+// Not logged in message component
+function NotLoggedInMessage() {
+  return (
+    <View
+      style={[
+        styles.container,
+        { justifyContent: 'center', alignItems: 'center', padding: 20 },
+      ]}
+    >
+      <Text
+        style={{
+          fontSize: 18,
+          fontWeight: 'bold',
+          marginBottom: 10,
+          textAlign: 'center',
+        }}
+      >
+        You are not logged in
+      </Text>
+      <Text style={{ fontSize: 16, textAlign: 'center' }}>
+        Please login to access friends dashboard.
+      </Text>
+    </View>
+  );
+}
+
+// Loading component
+function LoadingIndicator() {
+  return (
+    <View
+      style={[
+        styles.container,
+        { justifyContent: 'center', alignItems: 'center' },
+      ]}
+    >
+      <Text style={{ fontSize: 16 }}>Loading friends dashboard...</Text>
+    </View>
+  );
+}
 
 export default function FriendsScreen() {
+  const [username, setUsername] = useState(''); // Username of the person sending the request
+  const [isLoading, setIsLoading] = useState(true);
   const [friendRequestName, setFriendName] = useState('');
   const [pendingFriends, setPendingFriends] = useState([]);
   const [currentFriends, setCurrentFriends] = useState([]);
   const [sentFriends, setSentFriends] = useState([]);
 
-  // Commented for future use
-  //  const [senderName, setSenderName] = useState('');
+  useEffect(() => {
+    // eslint-disable-next-line no-use-before-define
+    fetchUserAndFriends();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const fetchUserAndFriends = async () => {
+    try {
+      const retrievedUsername = await retrieveData('username');
+      setUsername(retrievedUsername || '');
 
-  const senderName = 'Conor'; // Username of the person sending the request
+      if (retrievedUsername && retrievedUsername !== '') {
+        // Fetch the friend requests and friends list
+        await pollFriendRequests(retrievedUsername);
+      }
 
-  // friend_list
-  // pending_friends
+      setIsLoading(false);
+    } catch (error) {
+      console.error('Error fetching user data:', error);
+      setIsLoading(false);
+    }
+  };
 
   // Function to send a friend request
   const sendFriendRequest = async () => {
@@ -31,7 +90,7 @@ export default function FriendsScreen() {
       // send friend request name & username of the person sending friend request
       const payload = {
         receiver: friendRequestName,
-        sender: senderName, // username of the person sending friend request
+        sender: username, // username of the person sending friend request
       };
 
       const baseUrl =
@@ -68,13 +127,8 @@ export default function FriendsScreen() {
     }
   };
 
-  const Poll = async () => {
+  const pollFriendRequests = async (senderName) => {
     try {
-      // send friend request name & username of the person sending friend request
-      // const payload = {
-      // sender: "Conor", // username of the person sending friend request
-      // };
-
       const baseUrl =
         Platform.OS === 'web'
           ? 'http://localhost:8000'
@@ -116,23 +170,29 @@ export default function FriendsScreen() {
 
   // Poll for friend requests every 5 seconds
   useEffect(() => {
+    // Only set up polling if the user is logged in
+    if (!username || username === '') {
+      return () => {}; // Return empty cleanup function if not logged in
+    }
+
+    // Initial poll
+    pollFriendRequests(username);
+
     const intervalId = setInterval(() => {
-      Poll();
+      pollFriendRequests(username);
     }, 5000); // Poll every 5 seconds
 
     // Cleanup function to clear the interval when the component unmounts
     return () => clearInterval(intervalId);
-  }, []);
+  }, [username]); // Re-run if username changes
 
   // Function to accept a friend request
   const processFriendRequest = async (friend, answer) => {
-    // setCurrentFriends([...currentFriends, friend]);
-
     try {
       // send friend request name & username of the person sending friend request
       const payload = {
         requester: friend,
-        user: senderName,
+        user: username,
         answer,
       };
 
@@ -158,7 +218,9 @@ export default function FriendsScreen() {
 
         alert(serverMessage.message);
         setPendingFriends(pendingFriends.filter((name) => name !== friend));
-        setCurrentFriends(currentFriends.filter((name) => name !== friend));
+        if (answer) {
+          setCurrentFriends([...currentFriends, friend]);
+        }
       } else {
         // Log the raw response text for debugging
         const responseText = await response.text();
@@ -175,7 +237,7 @@ export default function FriendsScreen() {
     try {
       // send friend request name & username of the person sending friend request
       const payload = {
-        user: senderName, // username of the person removing friend
+        user: username, // username of the person removing friend
         friend, // friend to be removed
       };
 
@@ -217,7 +279,7 @@ export default function FriendsScreen() {
     try {
       // send friend request name & username of the person sending friend request
       const payload = {
-        user: senderName, // username of the person removing friend
+        user: username, // username of the person removing friend
         friend, // friend to be removed
       };
 
@@ -254,6 +316,17 @@ export default function FriendsScreen() {
     }
   };
 
+  // If still loading, show loading indicator
+  if (isLoading) {
+    return <LoadingIndicator />;
+  }
+
+  // If not logged in (username is empty), show not logged in message
+  if (!username || username === '') {
+    return <NotLoggedInMessage />;
+  }
+
+  // Otherwise, show the normal friends dashboard
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
       <View style={styles.container}>
@@ -293,7 +366,6 @@ export default function FriendsScreen() {
         <View style={styles.listContainer}>
           <Text style={styles.sectionTitle}>Pending Friend Requests</Text>
           <FlatList
-            onPress={() => Poll()}
             data={pendingFriends}
             keyExtractor={(item, index) => index.toString()}
             renderItem={({ item }) => (
diff --git a/client/src/LogIn.js b/client/src/LogIn.js
index ee10cfb..1944710 100644
--- a/client/src/LogIn.js
+++ b/client/src/LogIn.js
@@ -10,7 +10,6 @@ import {
 import { handleLogin } from './utils/accountUtils';
 import styles from './components/styles/Login.styles';
 
-
 export default function LoginScreen({ navigation }) {
   const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
@@ -19,28 +18,28 @@ export default function LoginScreen({ navigation }) {
   return (
     <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
       <SafeAreaView style={styles.container}>
-            <TextInput
-              placeholder="Username"
-              value={username}
-              onChangeText={(text) => setUsername(text)}
-              style={styles.TextInput}
-              onSubmitEditing={() => ref2.current.focus()}
-            />
-            <TextInput
-              ref={ref2}
-              placeholder="Password"
-              value={password}
-              onChangeText={(text) => setPassword(text)}
-              secureTextEntry
-              style={styles.TextInput}
-            />
-            <TouchableOpacity
-              style={styles.TouchableOpacity}
-              onPress={() => handleLogin(username, password, navigation)}
-              color="#841584"
-            >
-              <Text style={styles.TouchableOpacityText}>Log In</Text>
-            </TouchableOpacity>
+        <TextInput
+          placeholder="Username"
+          value={username}
+          onChangeText={(text) => setUsername(text)}
+          style={styles.TextInput}
+          onSubmitEditing={() => ref2.current.focus()}
+        />
+        <TextInput
+          ref={ref2}
+          placeholder="Password"
+          value={password}
+          onChangeText={(text) => setPassword(text)}
+          secureTextEntry
+          style={styles.TextInput}
+        />
+        <TouchableOpacity
+          style={styles.TouchableOpacity}
+          onPress={() => handleLogin(username, password, navigation)}
+          color="#841584"
+        >
+          <Text style={styles.TouchableOpacityText}>Log In</Text>
+        </TouchableOpacity>
       </SafeAreaView>
     </View>
   );
diff --git a/client/src/SustainabilityDashboard.js b/client/src/SustainabilityDashboard.js
index f6203aa..3e8c825 100644
--- a/client/src/SustainabilityDashboard.js
+++ b/client/src/SustainabilityDashboard.js
@@ -118,24 +118,25 @@ const configureLineChartData = (yearEmissions) => {
 
   // Month mapping to full names
   const monthMapping = {
-    1: 'Jan',
-    2: 'Feb',
-    3: 'Mar',
-    4: 'Apr',
-    5: 'May',
-    6: 'Jun',
-    7: 'Jul',
-    8: 'Aug',
-    9: 'Sep',
-    10: 'Oct',
-    11: 'Nov',
-    12: 'Dec',
+    month_1: 'Jan',
+    month_2: 'Feb',
+    month_3: 'Mar',
+    month_4: 'Apr',
+    month_5: 'May',
+    month_6: 'Jun',
+    month_7: 'Jul',
+    month_8: 'Aug',
+    month_9: 'Sep',
+    month_10: 'Oct',
+    month_11: 'Nov',
+    month_12: 'Dec',
   };
 
-  // Sort the months numerically
-  const sortedMonths = Object.keys(yearEmissions)
-    // eslint-disable-next-line prettier/prettier
-    .sort((a, b) => parseInt(a, 10) - parseInt(b, 10));
+  // Sort the months numerically based on their suffix
+  const sortedMonths = Object.keys(yearEmissions).sort(
+    (a, b) => parseInt(a.split('_')[1], 10) - parseInt(b.split('_')[1], 10),
+  );
+
   return {
     labels: sortedMonths.map((month) => monthMapping[month]),
     datasets: [
@@ -165,7 +166,50 @@ const chartConfig = {
   },
 };
 
+// Not logged in message component
+function NotLoggedInMessage() {
+  return (
+    <View
+      style={[
+        susDashboardStyles.container,
+        { justifyContent: 'center', alignItems: 'center', padding: 20 },
+      ]}
+    >
+      <Text
+        style={{
+          fontSize: 18,
+          fontWeight: 'bold',
+          marginBottom: 10,
+          textAlign: 'center',
+        }}
+      >
+        You are not logged in
+      </Text>
+      <Text style={{ fontSize: 16, textAlign: 'center' }}>
+        Please log in to view your sustainability dashboard and track your
+        progress.
+      </Text>
+    </View>
+  );
+}
+
+// Loading component
+function LoadingIndicator() {
+  return (
+    <View
+      style={[
+        susDashboardStyles.container,
+        { justifyContent: 'center', alignItems: 'center' },
+      ]}
+    >
+      <Text style={{ fontSize: 16 }}>Loading dashboard...</Text>
+    </View>
+  );
+}
+
 export default function Dashboard() {
+  const [username, setUsername] = useState('');
+  const [isLoading, setIsLoading] = useState(true);
   const [userSustainabilityScore, setUserSustainabilityScore] = useState(0);
   const [userSustainabilityImage, setUserSustainabilityImage] = useState(bald); // Default image
   const [leaderBoardData, setLeaderBoardData] = useState([]);
@@ -187,10 +231,26 @@ export default function Dashboard() {
 
   useEffect(() => {
     // eslint-disable-next-line no-use-before-define
-    getSustainabilityStats();
+    fetchUserAndStats();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  const fetchUserAndStats = async () => {
+    try {
+      const retrievedUsername = await retrieveData('username');
+      setUsername(retrievedUsername || '');
+
+      if (retrievedUsername && retrievedUsername !== '') {
+        // eslint-disable-next-line no-use-before-define
+        await getSustainabilityStats(retrievedUsername);
+      }
+      setIsLoading(false);
+    } catch (error) {
+      console.error('Error fetching user data:', error);
+      setIsLoading(false);
+    }
+  };
+
   const updateGridItems = (rawDistances) => {
     const items = [
       {
@@ -240,16 +300,8 @@ export default function Dashboard() {
     );
   };
 
-  const getSustainabilityStats = async () => {
+  const getSustainabilityStats = async (senderName) => {
     try {
-      let senderName = await retrieveData('username');
-
-      console.log(senderName);
-
-      if (senderName == null) {
-        senderName = 'test_user'; // Default name if not found
-      }
-
       const baseUrl =
         Platform.OS === 'web'
           ? 'http://localhost:8000'
@@ -288,8 +340,8 @@ export default function Dashboard() {
 
         // Format leaderboard data with icons
         const formattedLeaderboardData = Object.entries(friendsSusScores)
-          .map(([username, sustainabilityScore]) => ({
-            name: username,
+          .map(([usernameParam, sustainabilityScore]) => ({
+            name: usernameParam,
             sustainabilityScore: parseInt(sustainabilityScore, 10),
             icon: getIconForScore(parseInt(sustainabilityScore, 10)),
           }))
@@ -346,6 +398,17 @@ export default function Dashboard() {
     ]).start();
   };
 
+  // If still loading, show loading indicator
+  if (isLoading) {
+    return <LoadingIndicator />;
+  }
+
+  // If not logged in (username is empty), show not logged in message
+  if (!username || username === '') {
+    return <NotLoggedInMessage />;
+  }
+
+  // Otherwise, render the full dashboard
   return (
     <ScrollView
       style={susDashboardStyles.container} // Outer container styles
diff --git a/server/src/main.py b/server/src/main.py
index fcc27cf..ebd30cb 100644
--- a/server/src/main.py
+++ b/server/src/main.py
@@ -14,6 +14,7 @@
 from src.wayfinding import wayfinding_router_setup
 from src.sustainability import Sustainability
 
+
 class Server:
     def __init__(self):
         # Configure logging
@@ -31,8 +32,9 @@ def __init__(self):
         self.networking = Networking(self.app, self.logger)
         self.preferences_logic = Preferences(self.app, self.logger)
         self.sustainability = Sustainability(self.app, self.logger)
-        self.signup_logic = Signup(self.app, self.logger,
-                                   self.preferences_logic)
+        self.signup_logic = Signup(
+            self.app, self.logger, self.preferences_logic, self.sustainability
+        )
 
         wayfinding_router = wayfinding_router_setup(
             preferences_logic=self.preferences_logic,
diff --git a/server/src/signup.py b/server/src/signup.py
index a8fc474..e1660c9 100644
--- a/server/src/signup.py
+++ b/server/src/signup.py
@@ -2,6 +2,8 @@
 from fastapi import HTTPException
 from .Database_class import DataBase
 from src.preferences import Preferences
+from src.sustainability import Sustainability
+
 import logging
 
 
@@ -9,11 +11,17 @@
 
 
 class Signup:
-    def __init__(self, api, logger: logging.Logger,
-                 preferences_logic: Preferences):
+    def __init__(
+        self,
+        api,
+        logger: logging.Logger,
+        preferences_logic: Preferences,
+        sustainability: Sustainability,
+    ):
         self.app = api
         self.logger = logger
         self.preferences = preferences_logic
+        self.sustainability = sustainability
         # register signup route
         self.handle_signup()
 
@@ -59,6 +67,10 @@ def signup_user(self, username: str, password: str):
         db.close_con()
 
         self.preferences.db_initialise_preferences(username)
+        self.sustainability.db_initialise_sustainability(
+            username
+        )
+
         return True
 
 
diff --git a/server/src/sustainability.py b/server/src/sustainability.py
index 74e6bb2..3b6babb 100644
--- a/server/src/sustainability.py
+++ b/server/src/sustainability.py
@@ -1,9 +1,11 @@
 from enum import Enum
 import logging
-from fastapi import Query, HTTPException
+from fastapi import Query, HTTPException, APIRouter
 from dotenv import load_dotenv
 from .Database_class import DataBase
 
+router = APIRouter()
+
 
 class VehicleEnum(Enum):
     Bus = "bus"
@@ -25,6 +27,48 @@ def __init__(self, api, logger: logging.Logger):
         # Register Endpoints
         self.api_get_sus_stats()
 
+    def db_initialise_sustainability(self, username):
+        db = DataBase()
+        db.connect_db()
+
+        # Monthly distances table
+        current_month_distances_dict = {
+            "username": username,
+            "bike": 0,
+            "car": 0,
+            "luas": 0,
+            "train": 0,
+            "bus": 0,
+            "walk": 0,
+            "total": 0,
+        }
+
+        db.add_entry("monthly_distance", current_month_distances_dict)
+        self.logger.info("User entry added to current month distances")
+
+        # Current year emissions table
+
+        year_emissions_dict = {
+            "username": username,
+            "month_1": 0,
+            "month_2": 0,
+            "month_3": 0,
+            "month_4": 0,
+            "month_5": 0,
+            "month_6": 0,
+            "month_7": 0,
+            "month_8": 0,
+            "month_9": 0,
+            "month_10": 0,
+            "month_11": 0,
+            "month_12": 0,
+        }
+
+        db.add_entry("monthly_emissions_2025", year_emissions_dict)
+        self.logger.info("User entry added to monthly emissions table")
+
+        db.close_con()
+
     def api_get_sus_stats(self):
         @self.app.get("/get_sus_stats")
         async def get_sus_stats(user: str = Query(..., alias="sender")):
@@ -133,7 +177,14 @@ def db_get_friends_sust_scores(self, user):
         if isinstance(friends_list, tuple):
             friends_list = list(friends_list)
 
-        friends_list.append(user)
+        # Check for no friends
+        if not friends_list:  # This handles both None and empty lists
+            self.logger.info(f"Friends list empty for: {user}")
+            friends_list = [
+                user
+            ]  # Create a list with the user as the only entry
+        else:
+            friends_list.append(user)  # Append the user to the existing list
 
         friend_scores = {}
         for friend in friends_list:
diff --git a/server/src/wayfinding.py b/server/src/wayfinding.py
index 72ed471..93e67f7 100644
--- a/server/src/wayfinding.py
+++ b/server/src/wayfinding.py
@@ -74,9 +74,10 @@ def get_routes_with_preferences(
             "alternatives": str(alternatives).lower(),
             "key": GOOGLE_MAPS_API_KEY,
             "username": username,
-            "avoid": toAvoid
+            "avoid": toAvoid,
         }
 
         response = requests.get(url, params=parameters)
         return response.json()
+
     return router
diff --git a/server/tests/test_signup.py b/server/tests/test_signup.py
index 8bd7739..80fe1d7 100644
--- a/server/tests/test_signup.py
+++ b/server/tests/test_signup.py
@@ -11,6 +11,11 @@ def db_initialise_preferences(self, username):
         print("Mocking preferences")
 
 
+class MockSustainability:
+    def db_initialise_sustainability(self, username):
+        print("Mocking sustainability")
+
+
 @pytest.fixture
 def test_app():
     """
@@ -20,8 +25,13 @@ def test_app():
     app = FastAPI()
     logger = logging.getLogger("test_logger")
     mock_preferences = MockPreferences()
+    mock_sustainability = MockSustainability()
     signup = Signup(  # noqa: F841
-        api=app, logger=logger, preferences_logic=mock_preferences)
+        api=app,
+        logger=logger,
+        preferences_logic=mock_preferences,
+        sustainability=mock_sustainability,
+    )
     return TestClient(app)