diff --git a/Login/DefaultApp-Chrome.ps1 b/Login/DefaultApp-Chrome.ps1
index 16915e2..8b7323f 100644
--- a/Login/DefaultApp-Chrome.ps1
+++ b/Login/DefaultApp-Chrome.ps1
@@ -1,5 +1,5 @@
 # Script to set Google Chrome as default for specified file types and link types
-$fileTypes = @(".htm", ".html", ".mhtml", ".svg", ".shtml", ".webp", ".xht", ".xhtml")
+$fileTypes = @(".htm", ".html", ".mhtml", ".svg", ".shtml", ".xht", ".xhtml")
 $linkTypes = @("http", "https")
 $setUserFtaPath = "C:\Scripts\Software\setuserfta.exe"
 
diff --git a/Login/DefaultApp-ImageGlass.ps1 b/Login/DefaultApp-ImageGlass.ps1
new file mode 100644
index 0000000..62fe116
--- /dev/null
+++ b/Login/DefaultApp-ImageGlass.ps1
@@ -0,0 +1,42 @@
+# Script to set ImageGlass as default for specified file types
+$fileTypes = @(".png", ".jpg", ".jpeg", ".webp", ".gif", ".tiff", ".bmp", ".heif", ".heic")
+$setUserFtaPath = "C:\Scripts\Software\setuserfta.exe"
+
+# Function to check and set default app for a file type
+function Set-DefaultAppIfNeeded {
+    param(
+        [string]$fileType
+    )
+
+    try {
+        # Get the current default app for the file type
+        $currentDefault = (Get-ItemProperty "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$fileType\UserChoice" -ErrorAction SilentlyContinue).ProgId
+
+        # Check if ImageGlass is not the default
+        if ($currentDefault -ne "ImageGlass") {
+            Write-Host "Setting ImageGlass as default for $fileType"
+            
+            # Ensure setuserfta.exe path exists
+            if (-not (Test-Path $setUserFtaPath)) {
+                Write-Error "setuserfta.exe not found at $setUserFtaPath"
+                return
+            }
+
+            # Run setuserfta.exe to set ImageGlass as default
+            Start-Process $setUserFtaPath -ArgumentList "`"$fileType`" ImageGlass" -Wait -NoNewWindow
+        }
+        else {
+            Write-Host "ImageGlass is already the default for $fileType"
+        }
+    }
+    catch {
+        Write-Error "Error processing $fileType`: $_"
+    }
+}
+
+# Process each file type
+foreach ($type in $fileTypes) {
+    Set-DefaultAppIfNeeded -fileType $type
+}
+
+Write-Host "File type default app check completed."
\ No newline at end of file
diff --git a/TCSE-Login.bat b/TCSE-Login.bat
index 498c884..787a464 100644
--- a/TCSE-Login.bat
+++ b/TCSE-Login.bat
@@ -18,6 +18,10 @@ powershell -ExecutionPolicy Bypass -File "C:\Scripts\Login\DefaultApp-Adobe.ps1"
 echo Setting Google Chrome to Default Browser... >> "%LOGFILE%"
 powershell -ExecutionPolicy Bypass -File "C:\Scripts\Login\DefaultApp-Chrome.ps1"
 
+:: Set ImageGlass to Default Photo Viewer
+echo Setting ImageGlass to Default Photo Viewer... >> "%LOGFILE%"
+powershell -ExecutionPolicy Bypass -File "C:\Scripts\Login\DefaultApp-ImageGlass.ps1"
+
 :: Run Debloat Script
 powershell -ExecutionPolicy Bypass -File "C:\Scripts\Software\Win11Debloat\Win11Debloat.ps1" -Silent -RemoveW11Outlook -DisableTelemetry -DisableBing -DisableSuggestions -DisableLockscreenTips -ShowKnownFileExt